[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [bridgedb/master] Update translations.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [bridgedb/master] Update translations.
From: phw@xxxxxxxxxxxxxx
Date: Wed, 27 May 2020 17:14:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 27 May 2020 13:26:53 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Philipp Winter <phw@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 1a42375ff5d74c3b15139a56318c41e2314741fc
Author: Philipp Winter <phw@xxxxxxxxx>
Date:   Wed May 20 18:33:43 2020 -0700

    Update translations.
---
 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po    | 367 ++++++++++----------
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/be/LC_MESSAGES/bridgedb.po    | 361 ++++++++++----------
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po    | 399 ++++++++++++++++++++++
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po    | 398 +++++++++++----------
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po    | 360 ++++++++++---------
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po    | 399 +++++++++++-----------
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po    | 360 ++++++++++---------
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po    | 360 ++++++++++---------
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
 bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po    | 359 +++++++++----------
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po    | 360 +++++++++----------
 bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 359 ++++++++++---------
 bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
 bridgedb/i18n/et/LC_MESSAGES/bridgedb.po    | 359 ++++++++++---------
 bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po    | 427 +++++++++++++++++++----
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po    | 373 ++++++++++----------
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po    | 363 ++++++++++----------
 bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po    | 399 ++++++++++++++++++++++
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po    | 399 ++++++++++++++++++++++
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po    | 366 ++++++++++----------
 bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po    | 401 +++++++++++-----------
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po    | 361 ++++++++++----------
 bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po    | 366 ++++++++++----------
 bridgedb/i18n/is/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po    | 362 ++++++++++----------
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po    | 380 +++++++++++----------
 bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po    | 357 ++++++++++---------
 bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/km/LC_MESSAGES/bridgedb.po    | 513 +++++++++++++++-------------
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po    | 361 ++++++++++----------
 bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po    | 406 ++++++++++++++++++++++
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po    | 357 ++++++++++---------
 bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po    | 404 ++++++++++++++++++++++
 bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po    | 400 ++++++++++++++++++++++
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po    | 366 ++++++++++----------
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po    | 395 +++++++++++----------
 bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
 bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po    | 402 ++++++++++++++++++++++
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po    | 359 ++++++++++---------
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 363 ++++++++++----------
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 371 ++++++++++----------
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po    | 358 ++++++++++---------
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po    | 393 +++++++++++----------
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po    | 357 ++++++++++---------
 bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po    | 378 ++++++++++----------
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po    | 357 ++++++++++---------
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po    | 370 ++++++++++----------
 bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po    | 399 ++++++++++++++++++++++
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po    | 357 ++++++++++---------
 bridgedb/i18n/th/LC_MESSAGES/bridgedb.po    | 436 +++++++++++++++++++----
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po    | 361 ++++++++++----------
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po    | 356 ++++++++++---------
 bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po    | 399 ++++++++++++++++++++++
 bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po    | 401 ++++++++++++++++++++++
 bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po    | 389 +++++++++++----------
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 363 ++++++++++----------
 bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
 70 files changed, 15944 insertions(+), 10200 deletions(-)

diff --git a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
index 0a071e3..2da7329 100644
--- a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
+# AbdAlnour Sami <me@xxxxxxxxxxxx>, 2019
 # Abderrahman Ait Ali <abde.aitali@xxxxxxxx>, 2017
 # A. Hassan <a_hassan@xxxxxxxxxxx>, 2015
 # Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2014
+# Ahmed IB <mee.tbhole@xxxxxxxxx>, 2019
 # allamiro <allamiro@xxxxxxxxx>, 2011
 # Ash <ali.shatrieh@xxxxxxxxx>, 2014
 # blah bleh <wshalash@xxxxxxxxxxxxx>, 2018
@@ -15,6 +17,7 @@
 # Elias Saba <elias55saba@xxxxxxxxx>, 2018
 # AnonymousLady <farah.jaza@xxxxxxxxxxx>, 2014
 # 0xidz <ghoucine@xxxxxxxxx>, 2014
+# hussin altiry <husss2011@xxxxxxxxx>, 2020
 # lamine Kacimi <k_lamine27@xxxxxxxx>, 2015
 # Khaled Hosny, 2018
 # maher tharwat <mahmoud_tharwat2002@xxxxxxxxxxx>, 2016
@@ -31,116 +34,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-04 10:15+0000\n"
-"Last-Translator: shadows99 <nabils51@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ø¹Ø°Ø±Ø§Ù?! ØØ¯Ø« Ø®Ø·Ø£ Ù?Ù? Ø·Ù?Ø¨Ù?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø§Ù?Ù?ØºØ©"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ø§ØªØµÙ? Ø¨Ù?Ø§"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ØØ¯Ø¯ Ø§Ù?Ù?Ù?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "Ø£Ø¸Ù?Ø± Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ (QRCode)"
+msgstr "Ø£Ø¸Ù?Ø± Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ (Ø§Ù?Ø¨Ø§Ø±Ù?Ù?Ø¯ - QRCode)"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø®Ø·Ù?Ø· Ø§Ù?Ù?ØµÙ?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ù?Ù?Ø£Ø³Ù? Ù?Ù? Ù?ØªÙ? Ø§Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ù?Ø§ Ø·Ù?Ø¨Øª"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "Ø±Ù?Ø² Ø§Ù?Ø¨Ø§Ø±Ù?Ù?Ø¯ Ù?Ø®Ø·Ù?Ø· Ø§Ù?Ù?ØµÙ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Ù?Ø¨Ø¯Ù? Ø£Ù? Ù?Ù?Ø§Ù? Ø®Ø·Ø£ Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø±Ù?Ø²Ù? Ù?Ù?Ø¥Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹."
+msgstr "Ù?Ø¨Ø¯Ù? Ø£Ù? Ù?Ù?Ø§Ù? Ø®Ø·Ø£ Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø±Ù?Ø² Ø§Ù?Ø¨Ø§Ø±Ù?Ù?Ø¯."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø°Ø§ Ù?ØØªÙ?Ù? Ø¹Ù?Ù? Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? .Ø§Ù?Ø±Ø£ Ø§Ù?Ø±Ù?Ø² Ø¨Ù?Ø§Ø±Ø¦ Ù?Ù?Ø§Ø³Ø¨ Ù?Ù?Ø³Ø® Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? Ø¥Ù?Ù? Ø§Ù?Ù?Ø§ØªÙ? Ø§Ù?Ù?ØÙ?Ù?Ù? Ø£Ù? Ø£Ø¬Ù?Ø²Ø© Ø£Ø®Ø±Ù?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ø§ Ù?Ù?Ø¬Ø¯ Ø£Ù? bridges Ù?ØªØ§ØØ© ØØ§Ù?Ù?Ø§"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ø±Ø¨Ù?Ø§ ØªØØªØ§Ø¬ Ø¥Ù?Ù? %s Ø§Ù?Ø¹Ù?Ø¯Ø© %s Ù? Ø§Ø®ØªÙ?Ø§Ø± Ù?Ù?Ø¹ bridge Ù?Ø®ØªÙ?Ù?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ø®Ø·Ù?Ø© %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ØÙ?Ù? %s Ù?ØªØµÙ?Ø Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ø®Ø·Ù?Ø© %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ø®Ø·Ù?Ø© %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
@@ -149,27 +167,27 @@ msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ø£Ø¹Ø·Ù?Ù? bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªÙ?Ø¯Ù?Ø©"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ù?Ø§"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ù?Ø§ Ø´Ù?Ø¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÙ?%sØ¹Ù?!"
@@ -177,69 +195,37 @@ msgstr "%sÙ?%sØ¹Ù?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ£%sØµÙ? Ø¹Ù?Ù? Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ù?Ø°Ù? Ø±Ø³Ø§Ù?Ø© ØªÙ?Ù?Ø§Ø¦Ù?Ø© Ø? Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø¹Ø¯Ù? Ø§Ù?Ø±Ø¯.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ù?Ø°Ø§ Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¢Ù?Ù?.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ø§Ù?Ù? bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ù?Ù?Ø¯ ØªØ®Ø·Ù?Øª Ø§Ù?ØØ¯ Ø§Ù?Ù?Ø³Ù?Ù?Ø Ø¨Ù?. Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±! Ø§Ù?ØØ¯ Ø§Ù?Ø£Ø¯Ù?Ù? Ù?Ù? Ø§Ù?Ù?Ù?Øª Ø¨Ù?Ù? Ø§Ù?Ø±Ø³Ø§Ø¦Ù? Ù?Ù?  %s Ø³Ø§Ø¹Ø§Øª. Ù?Ù? Ø±Ø³Ø§Ø¦Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?Ø§Ø¯Ù?Ø© Ø®Ù?Ø§Ù? ØªÙ?Ù? Ø§Ù?Ù?ØªØ±Ù? Ø³Ù?ØªÙ? ØªØ¬Ø§Ù?Ù?Ù?Ø§."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs :(Ø§Ø¬Ù?Ø¹ Ø§Ù?Ù?COMMANDs Ù?ØªØØ¯Ù?Ø¯ Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªØ¹Ø¯Ø¯Ø© Ù?Ù? Ù?Ù?Øª Ù?Ø§ØØ¯)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ù?Ø±ØØ¨Ø§ Ø¨Ù?Ù? Ù?Ù? BridgeDB"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ù?Ø³Ø§Ø¦Ù? Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØªØ§ØÙ? TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ù?Ø±ØØ¨Ø§Ø? %s "
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ù?Ø±ØØ¨Ø§ ,ØµØ¯Ù?Ù?Ù?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ù?Ù?Ø§ØªÙ?Ø Ø¹Ø§Ù?Ø©"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ù?Ø°Ø§ Ø§Ù?Ø¨Ø±Ù?Ø¯ ØªÙ? Ø¥Ù?Ø´Ø§Ø¦Ù? Ù?Ù? %s Ù?Ù?Ù? %s Ø§Ù?Ø³Ø§Ø¹Ø© %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ø¥Ø°Ø§ Ù?Ù? ØªÙ?Ù? Ù?Ø°Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ù?Ù? Ù?Ø§ ØªØØªØ§Ø¬ Ø¥Ù?Ù?Ù? Ø? Ù?Ù?Ù? Ø¨Ø§Ù?Ø±Ø¯ Ø¹Ù?Ù? Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ø¨Ø£ØØ¯ Ø§Ù?Ø±Ø³Ø§Ø¦Ù?\nØ§Ù?Ø£Ù?Ø§Ù?Ø± Ø§Ù?ØªØ§Ù?Ù?Ø© Ù?Ù? Ù?Øµ Ø§Ù?Ø±Ø³Ø§Ù?Ø©:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -250,7 +236,7 @@ msgid ""
 msgstr "BridgeDB Ù?Ø³ØªØ·Ù?Ø¹ ØªÙ?Ù?Ù?Ø± %s Ø§Ù?Ù?Ø§Ø¹ Ù?Ù? Ø§Ù?Ù? Pluggable Transports %s Ù?Ù?Ù? ØªØ³Ø§Ø¹Ø¯ Ø¹Ù?Ù? ØªØ¹ØªÙ?Ù? Ø§ØªØµØ§Ù?Ø§ØªÙ? Ø¨Ø§Ù?Ù? Tor NetworkØ? Ù? Ù?Ù?ØªÙ?Ø¬Ø© Ù?Ø°Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù? Ø§Ù?ØµØ¹Ø¨ Ø¹Ù?Ù? Ø£Ù? Ø§ØØ¯ Ù?Ø±Ø§Ù?Ø¨ ØØ±Ù?Ø© Ù?Ø±Ù?Ø±Ù? Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø¨ØªØØ¯Ù?Ø¯ Ø§Ø°Ø§ Ù?Ø§ Ù?Ù?Øª ØªØ³ØªØ®Ø¯Ù? Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -262,7 +248,7 @@ msgstr "Ø¨Ø¹Ø¶ Ø§Ù?Ù? bridges Ù?Ù?Ø§ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø? Ù?Ù?Ù?Ù?Ù?Ø§ Ù?Ù?Ø³Øª 
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -271,134 +257,169 @@ msgid ""
 "\n"
 msgstr "Ø¨Ø§Ù?Ø£Ø¶Ø§Ù?Ø© Ø¥Ù?Ù? Ø°Ù?Ù?Ø? BridgeDB Ù?ØØªÙ?Ù? Ø¹Ù?Ù? bridges %s Ø¹Ø§Ø¯Ù?Ø© Ø¨Ø¯Ù?Ù? Ø£Ù? Pluggable Transports %s ØªØ³ØªØ·Ù?Ø¹ Ø§Ù?Ø¶Ø§ Ø§Ù?Ù?Ø³Ø§Ø¹Ø¯Ø© Ù?Ù? Ø§Ù?ØªØØ§Ù?Ù? Ø¹Ù?Ù? Ø±Ù?Ø§Ø¨Ø© Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù? Ø§Ù?Ù?Ø«Ù?Ø± Ù?Ù? Ø§Ù?Ø§ØÙ?Ø§Ù?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ù?Ø§ Ù?Ù? bridgesØ?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Ù?Ù? Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù? Ù?Ø±ØÙ?Ø§Øª Tor ØªØ³Ø§Ø¹Ø¯Ù? Ø¹Ù?Ù? Ø§Ù?ØªØØ§Ù?Ù? Ø¹Ù?Ù? Ø§Ù?ØØ¬Ø¨."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ø£ØØªØ§Ø¬ Ø¥Ù?Ù? Ù?Ø³Ù?Ù?Ø© Ø¨Ø¯Ù?Ù?Ø© Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¬Ø³Ù?Ø± Ù?Ù? Ø¹Ø¨Ø± Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù?Ù? Ù?Ø¬Ø¨ Ø§Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¹Ø¨Ø± Ø¹Ù?Ù?Ø§Ù? Ø¨Ø±Ù?Ø¯Ù? Ù?Ù? Ø¥ØØ¯Ù? Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø£Ù? %s Ø£Ù? %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø§Ù?Ø¬Ø³Ù?Ø± Ù?Ù? Ø£Ù? ØªØ±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù? Ù?Ø¬Ø¨ Ø¥Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¨Ø¥Ø³ØªØ®Ø¯Ø§Ù? Ø¹Ù?Ù?Ø§Ù? Ù?Ù? Ø£ØØ¯ Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø§Ù? %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "bridges Ù?Ø§ ØªØ¹Ù?Ù?! Ø£Ù?Ø§ Ø¨ØØ§Ø¬Ø© Ø¥Ù?Ù? Ù?Ø³Ø§Ø¹Ø¯Ø©!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ù?Ù? ØØ§Ù? Ø¹Ø¯Ù? Ø¹Ù?Ù? Tor, Ø§Ø±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?Ù? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ØØ§Ù?Ù? Ø§Ù? ØªØªØ¶Ù?Ù? Ø±Ø³Ø§Ù?ØªÙ? Ø¹Ù?Ù? Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ù?Ø«Ù?Ø±Ø© Ø¹Ù? Ù?Ø´Ù?Ù?ØªÙ?Ø? Ø¨Ù?Ø§ Ù?Ù? Ø°Ù?Ù? Ù?Ø§Ø¦Ù?Ø© Ø§Ù?Ù?bridges Ù? Pluggable Transports Ø§Ù?Ø°Ù? ØªØØ§Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù?Ù?Ø? Ù?Ø±Ù?Ù? Ù?Ø³Ø®Ø© Tor Browser Ù?Ø£Ù? Ø±Ø³Ø§Ø¦Ù? Ø§Ø¸Ù?Ø±Ù?Ø§ TorØ? Ø¥Ù?Ø®."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ø¥Ø°Ø§ Ù?Ù? Ù?Ù?Ø¯Ø± Ù?ØªØµÙ?Ø Tor Browser Ø¹Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù?Ø? Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø§Ù?Ø§Ø·Ù?Ø§Ø¹ Ø¹Ù?Ù? Ø¯Ù?Ù?Ù? Ø§Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù?%s Ù?Ø¨Ù?Ø§Ø¨Ø© Ø§Ù?Ø¯Ø¹Ù? %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ù?Ø§ Ù?Ù? Ø³Ø·Ù?Ø± Ø§Ù?Ù?Bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ø£ØØµÙ? Ø¹Ù?Ù? Bridges"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ø¢Ù?Ù?Ø§Øª ØªÙ?Ø²Ù?Ø¹ Ø§Ù?Ø¬Ø³Ø±"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "Ù?ØØ¬Ù?Ø²"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ù?Ø§ Ø´Ù?Ø¡"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ù? Ù?Ø¶Ù?Ù? ØØ¯Ø¯ Ø§Ù?Ø®Ù?Ø§Ø±Ø§Øª Ù?Ù?Ù?Ø¹ Ø§Ù?Ù?bridge"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¥Ù?Ù? %sØ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?ØªØµÙ?ØÙ? Ù?Ø§ Ù?Ø¹Ø±Ø¶ Ø§Ù?ØµÙ?Ø± Ø¨Ø´Ù?Ù? ØµØÙ?Ø"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ø£Ø¯Ø®Ù? Ø§Ù?ØØ±Ù?Ù? Ø£Ù? Ø§Ù?Ø£Ø±Ù?Ø§Ù? Ù?Ù? Ø§Ù?ØµÙ?Ø±Ø© Ø£Ø¹Ù?Ø§Ù? ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ù?Ù?Ù? ØªØ¨Ø¯Ø£ Ø¨Ø§Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?Ù?bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ù?ØªØªÙ?Ù?Ù? Ù?Ù? Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ø¥Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø TorØ? Ø£Ø°Ù?Ø¨ Ø¥Ù?Ù? %s ØµÙ?ØØ© ØªØÙ?Ù?Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø  Tor %s Ù?Ø£ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ù?Ù?Ù?Ø§ Ù?Ù? Ø§Ø¬Ù? ØªØÙ?Ù?Ù? Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ù?ØªØµÙ?Ø  Tor"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ø¹Ù?Ø¯ Ø¸Ù?Ù?Ø± Ø´Ø§Ø´Ø© 'Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© Tor'Ø? Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'ØªÙ?Ù?Ù?Ù?' Ù? Ø§ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª ØØªÙ? ØªØ³Ø£Ù?Ù? Ø¹Ù?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª (ISP) Ø§Ù?Ø®Ø§Øµ Ø¨Ù? Ø¨Ù?Ù?Ø¹ Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© Tor Ø£Ù? Ù?Ø±Ø§Ù?Ø¨ØªÙ?Ø§ Ø¨Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù?Ø?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Ø·Ù?Ø¨ Ø¬Ø³Ù?Ø± Tor ØºÙ?Ø± Ø§Ù?Ù?Ø´Ù?Ø´Ø©.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ø§Ø®ØªØ§Ø± 'Ù?Ø¹Ù?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? Ø¨Ù?ØµÙ? Ø§Ù?Ù?bridges Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø© Ù?Ù? Ø§Ù?Ù?Ø±Ø¨Ø¹. Ø«Ù? Ø§Ø®ØªØ§Ø± 'Ø§ØªØµØ§Ù?' Ù? Ø§Ø°Ø§ Ù?Ø§Ø¬Ù?ØªÙ? Ù?Ø´Ù?Ù?Ø© Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'Ù?Ø³Ø§Ø¹Ø¯Ø©' Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø§Ø¹Ø¯Ø§Ø¯ Tor."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "ØªØ¸Ù?Ø± Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø©"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ø£Ø·Ù?Ø¨ bridges Ø¹Ø§Ø¯Ù?Ø©."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ø£Ø·Ù?Ø¨ IPv6 bridges"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ø£Ø·Ù?Ø¨ Pluggable Transport Ø¨Ù? TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(Ø·Ù?Ø¨ Ø¬Ø³Ù?Ø± IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? Ù?Ø³Ø®Ø© Ù?Ù? Ù?Ù?ØªØ§Ø GnuPG Ø§Ù?Ø¹Ø§Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù?BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Ø·Ù?Ø¨ Ø¬Ø³Ù?Ø± obfs4 Ø§Ù?Ù?Ø´Ù?Ø´Ø©.)"
diff --git a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
index 649a847..3f3dacd 100644
--- a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # D, 2014-2015
@@ -9,116 +9,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-01-17 21:21+0000\n"
-"Last-Translator: Emin Mastizada <emin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Problemi XÉ?bÉ?r Ver"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "MÉ?nbÉ? Kodu"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "DÉ?yiÅ?ikliklÉ?r"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Æ?laqÉ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "HamÄ±sÄ±nÄ± SeÃ§"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Kodu GÃ¶stÉ?r"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KÃ¶rpÃ¼ sÉ?tirlÉ?riniz Ã¼Ã§Ã¼n QR Kod"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Vay dÉ?dÉ?m!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "GÃ¶rÃ¼nÃ¼r QR Kodunuzu almada sÉ?hv yarandÄ±."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Bu QR Kodunda kÃ¶rpÃ¼ sÉ?tirlÉ?riniz var. Bunu QR Kod oxuyucularla gÃ¶zdÉ?n keÃ§irin vÉ? kÃ¶rpÃ¼ sÉ?tirlÉ?rinizi mobil vÉ? digÉ?r cihazlara kÃ¶Ã§Ã¼rÃ¼n."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "HazÄ±rda mÃ¼mkÃ¼n kÃ¶rpÃ¼ yoxdur..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ã?ox gÃ¼man ki, sÉ?n %s geri qayÄ±dÄ±b %s baÅ?qa kÃ¶rpÃ¼ nÃ¶vÃ¼ seÃ§mÉ?li idin!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1-ci%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor SÉ?yyahÄ±nÄ± %s Endir"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2-ci%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶rpÃ¼ %s Æ?ldÉ? Et"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3-cÃ¼%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
@@ -127,27 +142,27 @@ msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? kÃ¶rpÃ¼lÉ?ri ver!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "TÉ?kmillÉ?Å?dirilmiÅ? SeÃ§imlÉ?r"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Xeyr"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "heÃ§ biri"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sB%sÉ?li!"
@@ -155,69 +170,37 @@ msgstr "%sB%sÉ?li!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶rpÃ¼ Æ?ldÉ? Et"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu avtomatik mesajdÄ±r, lÃ¼tfÉ?n cavab yazmayÄ±n.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Bu da kÃ¶rpÃ¼lÉ?riniz:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "SÉ?s limitini keÃ§misÉ?n. LÃ¼tfÉ?n yavaÅ?la! EmaillÉ?r arasÄ± minimal vaxt\n%s saatdÄ±r. Bu zaman kÉ?siyindÉ? daxil edilÉ?n diÉ?r emaillÉ?r lÉ?Ä?v edilÉ?cÉ?kdir."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Æ?MRLÆ?R: (bir neÃ§É? seÃ§imi mÃ¼É?yyÉ?nlÉ?Å?dirmÉ?k Ã¼Ã§Ã¼n Æ?MRLÆ?Ri birlÉ?Å?dir)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-É? xoÅ? gÉ?lkmisÉ?n!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "MÃ¶vcud dÉ?stÉ?klÉ?nÉ?n nÉ?qliyyat NÃ?VlÉ?ri:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Salam, dost!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ä°ctimai AÃ§arlar"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Bu email gÃ¶y qurÅ?aÄ?Ä±, tÉ?buynuz vÉ? qÄ±Ä?Ä±lcÄ±mla hazÄ±rlanÄ±b\n%s Ã¼Ã§Ã¼n %s tarixdÉ? vÉ? %s saatda."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +211,7 @@ msgid ""
 msgstr "BridgeDB mÃ¼xtÉ?lif %s nÃ¶v Pluggable Transport %s vasitÉ?silÉ? kÃ¶rpÃ¼lÉ?r mÃ¼É?yyÉ?n \nedÉ? bilÉ?r, bu sÉ?nin internet trafikini yoxlamaq istÉ?yÉ?n hÉ?r hansÄ± Å?É?xs Ã¼Ã§Ã¼n \nÉ?laqÉ?lÉ?rini Tor Network ilÉ? kÃ¶lgÉ?lÉ?yÉ?rÉ?k sÉ?nin Tor istifadÉ? etdiyini mÃ¼É?yyÉ?n \netmÉ?sinÉ? daha Ã§ox mane olacaqdÄ±r.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -240,7 +223,7 @@ msgstr "Pluggable Transports vasitÉ?silÉ? mÃ¶vcud olan IPv6 Ã¼nvanlÄ± bir Ã§ox \
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +232,169 @@ msgid ""
 "\n"
 msgstr "Bundan É?lavÉ? BridgeDB Pluggable Transports %s olmayan bir sÄ±ra darÄ±xdÄ±rÄ±cÄ± \nkÃ¶rpÃ¼lÉ?r %s dÉ? vardÄ±r, amma onlar yenÉ? dÉ? internet senzurasÄ±ndan \nsovuÅ?maÄ?Ä± bacarÄ±rlar.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "KÃ¶rpÃ¼lÉ?r nÉ?dir?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s KÃ¶rpÃ¼lÉ?r %s Tor-un keÃ§idi olub sÉ?nÉ? senzuradan sovuÅ?maÄ?a kÃ¶mÉ?k edir."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "KÃ¶rpÃ¼lÉ?rin É?ldÉ? edilmÉ?sinin alternativ yollarÄ±nÄ± axtarÄ±ram!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "KÃ¶rpÃ¼lÉ?ri É?ldÉ? etmÉ?yin baÅ?qa yolu da %s emailinÉ? mÉ?ktub yazmaqdÄ±r. LÃ¼tfÉ?n, yadÄ±nda\nsaxla ki, email gÃ¶ndÉ?rÉ?n zaman aÅ?aÄ?Ä±dakÄ± email tÉ?min edicilÉ?rindÉ?n birini istifadÉ? etmÉ?lisÉ?n:\n%s, %s vÉ? ya %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "KÃ¶rpÃ¼lÉ?rim iÅ?lÉ?rmir! KÃ¶mÉ?yÉ? ehtiyacÄ±m var!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Æ?gÉ?r Tor iÅ?lÉ?mirsÉ?, sÉ?n %s Ã¼nvanÄ±na yazmalÄ±san."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Yaranan vÉ?ziyyÉ?t haqqÄ±nda É?traflÄ± mÉ?lumat yazmaÄ?a Ã§alÄ±Å?; kÃ¶rpÃ¼lÉ?rin siyahÄ±sÄ± vÉ? \nistifadÉ? etmÉ?yÉ? Ã§alÄ±Å?dÄ±Ä?Ä± Pluggable Transport-un adÄ±, Tor SÉ?yyahÄ±nÄ±n versiyasÄ± vÉ? \nTor tÉ?rÉ?findÉ?n aldÄ±Ä?Ä±n hÉ?r hansÄ± mesaj vÉ? s."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "SÉ?nin kÃ¶rpÃ¼ sÉ?tirlÉ?rin:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "KÃ¶rpÃ¼ Æ?ldÉ? Et!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "HeÃ§ biri"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfÉ?n, kÃ¶rpÃ¼ nÃ¶vlÉ?ri Ã¼Ã§Ã¼n seÃ§imlÉ?ri mÃ¼É?yyÉ?nlÉ?Å?dir:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 Ã¼nvanlara ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "SÉ?nin brauzerin Å?É?killÉ?ri gÃ¶stÉ?rÉ? bilmir."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "YuxarÄ±dakÄ± Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "KÃ¶rpÃ¼lÉ?ri necÉ? istifadÉ? edÉ?cÉ?ksÉ?n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ä°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?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Æ?vvÉ?l 'BÉ?li' vÉ? daha sonra 'NÃ¶vbÉ?ti'-ni seÃ§. Yeni kÃ¶rpÃ¼lÉ?rini konfiqurasiya \netmÉ?k Ã¼Ã§Ã¼n kÃ¶rpÃ¼ sÉ?tirlÉ?rini kÃ¶Ã§Ã¼r vÉ? idxal qutusuna yapÄ±Å?dÄ±r. Æ?n son olaraq, \n'Æ?laqÉ? Yarat' dÃ¼ymÉ?sini kliklÉ? vÉ? mÉ?ncÉ? indi davam etmÉ?k Ã¼Ã§Ã¼n yaxÅ?Ä± vaxtdÄ±r! \nHÉ?r hansÄ± problemlÉ? Ã¼zlÉ?Å?sÉ?n, dÉ?stÉ?k Ã¼Ã§Ã¼n 'Tor Å?É?bÉ?kÉ? ParametrlÉ?ri' vizardÄ±nda \n'KÃ¶mÉ?k' dÃ¼ymÉ?sini kliklÉ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Bu mesajÄ± gÃ¶stÉ?rir."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Vanil kÃ¶rpÃ¼ xahiÅ? et."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 kÃ¶rpÃ¼ xahiÅ? et."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE-a gÃ¶rÉ? Pluggable Transport xahiÅ? et."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB-nin ictimai GnuPG aÃ§arÄ±nÄ±n Ã¼zÃ¼nÃ¼ É?ldÉ? et."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
index 6e94a94..c957a6c 100644
--- a/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Aleh Ladutska <lad-oleg@xxxxxxxxx>, 2014
 # Ulad L, 2018-2019
+# Ð?Ð°Ñ?Ðº Ð?ÐµÑ?Ð¿Ð°Ð»ÐµÐ²Ð½Ñ?Ð¹ <hackcat.dev@xxxxxxxxx>, 2019
 # StanislaÅ Silkin <moonblr29@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-02 16:51+0000\n"
-"Last-Translator: Ulad L\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ñ?Ð±Ð°Ñ?Ð°Ð¹Ñ?Ðµ! Ð¨Ñ?Ð¾Ñ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¹Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð¿Ð°Ð´Ñ?Ð°Ñ? Ð°Ð´Ð¿Ñ?Ð°Ñ?ÐºÑ? Ð²Ð°Ñ?Ð°Ð³Ð° Ð·Ð°Ð¿Ñ?Ñ?Ð°."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð¾Ð²Ð°"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð?Ð°Ð²ÐµÐ´Ð°Ð¼iÑ?Ñ? Ð¿Ñ?Ð° Ð±Ð°Ð³."
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð½Ñ?Ñ?Ð½Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ð·Ð¼ÐµÐ½Ð°Ñ?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð¡Ñ?Ð²Ñ?Ð·Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð±Ñ?Ð°Ñ?Ñ? Ð£Ñ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ð¹ Ð¼Ð°Ñ?Ñ?Ð¾Ñ?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?Ð¾Ð¹, Ð±Ð¾Ð¶Ñ?Ñ?Ð½Ð°!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð¾Ðº Ð· Ð²Ð°Ñ?Ñ?Ð¼i Ð¼Ð°Ñ?Ñ?Ð°Ð¼i"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð´Ð°ÐµÑ?Ñ?Ð°, Ð°Ð´Ð±Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð°Ð¼Ñ?Ð»ÐºÐ° Ð¿Ð°Ð´Ñ?Ð°Ñ? Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ð½Ð½Ñ? Ð?Ð°Ñ?Ð°Ð³Ð° QR-ÐºÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ñ?Ñ?Ñ? QR-ÐºÐ¾Ð´ Ñ?Ñ?Ñ?Ñ?Ð¼Ð»Ñ?Ð²Ð°Ðµ Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?. Ð?Ñ?Ð°Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ñ?Ð³Ð¾ Ð¿Ñ?Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð·Ðµ Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ñ?ÐºÐ° QR-ÐºÐ¾Ð´Ð°Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð³Ð¾, ÐºÐ°Ð± Ñ?ÐºÐ°Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? Ð½Ð° Ð¼Ð°Ð±Ñ?Ð»Ñ?Ð½Ñ?Ñ? Ñ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð°Ð´Ñ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð´Ð·ÐµÐ½Ñ? Ð¼Ð¾Ð¼Ð°Ð½Ñ? Ð½Ñ?Ð¼Ð° Ð´Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð°Ð³Ñ?Ñ?Ð¼Ð°, Ð²Ð°Ð¼ Ñ?Ñ?Ñ?Ð±Ð° Ð¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ð°Ð²Ð°Ñ?Ñ? %s Ð²Ñ?Ñ?Ð½Ñ?Ñ?Ñ?Ð° Ð½Ð°Ð·Ð°Ð´ %s Ñ? Ð°Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð½Ñ?Ñ? Ñ?Ñ?Ð¿ Ð¼Ð°Ñ?Ñ?Ð°."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡Ð¿Ð°Ð¼Ð¿Ñ?Ð¹Ñ?Ðµ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? %s Ð¼Ð°Ñ?Ñ?Ñ? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¦Ñ?Ð¿ÐµÑ? %s Ð´Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ñ? Tor Browser %s"
@@ -128,27 +144,27 @@ msgstr "Ð¦Ñ?Ð¿ÐµÑ? %s Ð´Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ñ? Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð° Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð½Ðµ Ð³Ñ?Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð´Ð°Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ð?Ð°Ð»Ð°Ð´Ñ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ñ?Ð¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -156,69 +172,37 @@ msgstr "%sÐ¢%sÐ°Ðº!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ñ?Ñ?Ð° Ð°Ñ?Ñ?Ð°Ð¼Ð°Ñ?Ñ?Ñ?Ð½Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ; ÐºÐ°Ð»Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹Ñ?Ðµ Ð½Ð° Ñ?Ð³Ð¾.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ñ? Ð¿ÐµÑ?Ð°Ð²Ñ?Ñ?Ñ?Ð»Ñ? Ð»Ñ?Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐºÐ°Ñ?Ñ?Ñ?. Ð?Ð°Ð»Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð·Ð°Ð¿Ð°Ð²Ð¾Ð»Ñ?Ð½Ñ?Ñ?ÐµÑ?Ñ?! Ð?Ñ?Ð½Ñ?Ð¼Ð°Ð»Ñ?Ð½Ñ? Ñ?Ð°Ñ? Ð¿Ð°Ð¼Ñ?Ð¶\ne-mail %s Ð³Ð°Ð´Ð·Ñ?Ð½. Ð£Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð»Ñ?Ñ?Ñ?Ñ? Ð· Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?Ñ?Ð³Ð°Ð¼ Ð³Ñ?Ñ?Ð°Ð³Ð° Ñ?Ð°Ñ?Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ñ? Ñ?Ð³Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ?Ð°."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (Ð°Ð±'Ñ?Ð´Ð½Ñ?Ð¹Ñ?Ðµ COMMANDs, ÐºÐ°Ð± Ð¿Ð°Ð·Ð½Ð°Ñ?Ñ?Ñ?Ñ? Ð½ÐµÐºÐ°Ð»Ñ?ÐºÑ? Ð²Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ð°Ñ? Ð°Ð´Ð½Ð°Ñ?Ð°Ñ?Ð¾Ð²Ð°)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð Ð°Ð´Ñ? Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð²Ð°Ñ? Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs, Ñ?Ñ?Ð¾ Ð·Ð°Ñ?Ð°Ð· Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼Ð»Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ð°:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ñ?Ñ?Ð²Ñ?Ñ?Ð°Ð½Ð½Ðµ, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ñ?Ñ?Ð°Ñ?, Ñ?Ñ?Ð±Ñ?Ð°!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ñ?Ð±Ð»Ñ?Ñ?Ð½Ñ?Ñ? Ð?Ð»Ñ?Ñ?Ñ?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?Ñ?Ñ?Ñ? e-mail Ð±Ñ?Ñ? Ñ?Ñ?Ð²Ð¾Ñ?Ð°Ð½Ñ? Ñ? Ð°Ñ?Ñ?Ð°Ð¼Ð°Ñ?Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð»Ð°Ð½Ñ? Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ñ?Ð¼Ñ? Ð¼ÐµÐ´Ð·Ð²ÐµÐ´Ð·Ñ?Ð½Ñ?Ñ?Ð°Ð¼Ñ?, Ð¼Ð°Ð»ÐµÐ½Ñ?ÐºÑ?Ð¼Ñ? Ð·Ð½Ñ?Ñ?ÐºÐ°Ð¼Ñ? Ñ? Ð·Ñ?Ñ?Ð°Ñ?Ð»Ñ?Ð²Ñ?Ð¼Ñ? Ð°Ð³ÐµÐ½Ñ?Ñ?Ñ?ÐºÐ°Ð¼Ñ? Ð´Ð»Ñ? %s Ñ?(Ñ?) %s Ñ?(Ñ?) %s ."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ð° Ð·Ð°Ð±Ñ?Ñ?Ð¿ÐµÑ?Ð²Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ð¾Ð·Ð½Ñ?Ð¼Ñ? %sÑ?Ñ?Ð¿Ð°Ð¼Ñ? Pluggable Transports%s,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð³Ñ?Ñ?Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð°Ð³Ñ?Ñ? Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð¿Ð°Ð´Ð»Ñ?Ñ?Ñ?Ð½Ð½Ñ? Ð´Ð° Tor Network. Ð?Ð»Ñ? Ñ?Ñ?Ñ?, Ñ?Ñ?Ð¾ Ð½Ð°Ð·Ñ?Ñ?Ð°Ðµ Ð·Ð° Ð²Ð°Ñ?Ñ?Ð¼ Ð?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?-Ñ?Ñ?Ð°Ñ?Ñ?ÐºÐ°Ð¼ Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ñ?Ñ?Ð° Ð±Ð¾Ð»Ñ?Ñ? Ñ?ÐºÐ»Ð°Ð´Ð°Ð½Ñ?Ð¼\nÐ²Ñ?Ð·Ð½Ð°Ñ?Ñ?Ñ?Ñ?, Ñ?Ñ?Ð¾ Ð²Ñ?\nÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°ÐµÑ?ÐµÑ?Ñ? Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,7 @@ msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ñ?Ð°ÐºÑ?Ð°Ð¼Ð° Ð½ÐµÐºÐ°Ñ?Ð¾Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ð· IPv6
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
 "\n"
 msgstr "Ð¢Ð°ÐºÑ?Ð°Ð¼Ð° Ð¼Ð°Ñ?Ñ?Ñ? BridgeDB Ð¼Ð°Ñ?Ñ?Ñ? Ð¼Ð½Ð¾Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? %s, Ñ?ÐºÑ?Ñ? Ð½Ðµ Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ñ? Ð¿ÐµÑ?Ð°Ð´Ð°Ñ?Ñ? Ð´Ð°Ð´Ð·ÐµÐ½Ð½Ñ?Ñ?\nPluggable Transports %s. Ð?Ñ?Ñ?Ð° Ð³Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ðµ Ð²ÐµÐ»Ñ?Ð¼Ñ? Ð´Ð¾Ð±Ñ?Ð°, Ñ? Ð¼Ð¾Ð¶Ð° Ð¿Ð°Ñ?Ð¿Ð»Ñ?Ð²Ð°Ñ?Ñ? Ð½Ð° Ñ?Ð¾Ðµ, Ñ?Ðº Ð°Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ð° Ñ?Ð°Ð¹Ñ?Ñ?, Ð°Ð´Ð½Ð°Ðº Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ðº Ñ? Ñ?Ð°Ð½ÐµÐ¹,\nÐ´Ð°Ð¿Ð°Ð¼Ð°Ð³Ð°Ñ?Ñ?Ñ? Ð°Ð±Ñ?Ñ?Ð¾Ð´Ð·Ñ?Ñ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?-Ñ?Ñ?Ð½Ð·Ñ?Ñ?Ñ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð¾ Ð·Ð° Ð¼Ð°Ñ?Ñ?Ñ??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ð°Ñ?Ñ?Ñ? %s - Ð³Ñ?Ñ?Ð° Ñ?Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ? Tor, Ñ?ÐºÑ?Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ñ?Ñ?Ñ? Ð²Ð°Ð¼ Ð°Ð±Ð¼Ñ?Ð½Ñ?Ñ?Ñ? Ñ?Ñ?Ð½Ð·Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð½Ðµ Ñ?Ñ?Ñ?Ð±Ð° Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ðº-Ð½ÐµÐ±Ñ?Ð´Ð·Ñ? Ñ?Ñ?Ñ?Ñ?!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ð½Ñ?Ñ? Ñ?Ð¿Ð¾Ñ?Ð°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ñ?Ð¿Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? â?? Ð´Ð°Ñ?Ð»Ð°Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ? Ð»Ñ?Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?Ð°Ñ? %s. Ð?Ð²Ñ?Ñ?Ð½Ñ?Ñ?Ðµ Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ñ?Ð¾ Ð²Ñ? Ð¼Ñ?Ñ?Ñ?Ñ?Ðµ\nÐ´Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð»Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÑ? Ð· Ð°Ð´Ð½Ð°Ð³Ð¾ Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? e-mail Ñ?Ñ?Ð²Ñ?Ñ?Ð°Ñ?:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð°Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð°Ñ?Ñ?Ñ?Ð±Ð½Ð°Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ð°Ð»Ñ? Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ðµ, Ð·Ð²Ñ?Ñ?Ð½Ñ?Ñ?ÐµÑ?Ñ? Ð¿Ð° e-mail Ð°Ð´Ñ?Ð°Ñ?Ðµ %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð£ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ? Ð¿Ð°Ñ?Ñ?Ð°Ñ?Ð°Ð¹Ñ?ÐµÑ?Ñ? Ð´Ð°Ñ?Ñ? Ñ?Ðº Ð¼Ð°Ð³Ð° Ð±Ð¾Ð»Ñ?Ñ? Ñ?Ð½Ñ?Ð°Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð° Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ñ?, Ñ?ÐºÐ»Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð¼Ñ? Ð¼Ð°Ñ?Ñ?Ð° Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?, Ñ?ÐºÐ¾Ðµ Ð²Ñ? Ð²Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ð»Ñ? Ð´Ð»Ñ? Ð¿ÐµÑ?Ð°Ð´Ð°Ñ?Ñ? Ð´Ð°Ð´Ð·ÐµÐ½Ð½Ñ?Ñ?, Ð° Ñ?Ð°ÐºÑ?Ð°Ð¼Ð° Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Tor. "
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?Ðµ"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð°Ð»Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð°Ð±Ñ?Ñ?Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ð´Ñ? Ð´Ð»Ñ? Ñ?Ñ?Ð¿Ñ? Ð¼Ð°Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ IPv6 Ð°Ð´Ñ?Ð°Ñ?Ñ??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Ð°Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ðµ Ð²Ñ?Ñ?Ð²Ñ? Ð½ÐµÐºÐ°Ñ?Ñ?ÐºÑ?Ð½Ð°."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð²Ñ?Ð´Ð·Ñ?Ñ?Ðµ Ñ?Ñ?Ð¼Ð²Ð°Ð»Ñ? Ð· Ð²Ñ?Ñ?Ð²Ñ?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð°Ñ?Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð¼Ð°Ñ?Ñ?Ð°Ð¼Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð?Ð°Ð± Ð´Ð°Ð´Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ? Ð¼Ð¾Ñ?Ñ? Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Tor,  Ñ?Ñ?Ñ?Ð±Ð° Ð¿ÐµÑ?Ð°Ð¹Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ñ?Ð¾Ð½ÐºÑ? Ñ?Ð¿Ð°Ð¼Ð¿Ð¾Ñ?Ð²Ð°Ð½Ð½Ñ? %s Tor Browser\n %s Ñ? Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ð¹ Ð¿Ð° Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ñ?Ñ?Ñ?\nÐ±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?Ð°Ð»Ñ? Ð²Ñ?Ñ?ÐºÐ°ÐºÐ½Ðµ Ð´Ð°Ñ?Ð»Ð¾Ð³Ð°Ð²Ð°Ðµ Ð²Ð°ÐºÐµÐ½Ñ?Ð° \"Ð¡ÐµÑ?ÐºÐ°Ð²Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Tor\", Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ?\" Ñ? ÐºÑ?Ñ?Ñ?Ð¹Ñ?ÐµÑ?Ñ?\nÐ¿Ñ?Ð°Ð³Ñ?Ð°Ð¼Ð°Ð¹ Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ñ?ÐºÑ?, Ð¿Ð°ÐºÑ?Ð»Ñ? Ñ?Ð½Ð° Ð½Ðµ Ñ?Ð¿Ñ?Ñ?Ð°Ðµ:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð¦Ñ? Ð±Ð»Ð°ÐºÑ?Ðµ Ð²Ð°Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?-Ð¿Ñ?Ð°Ð²Ð°Ð¹Ð´Ñ?Ñ? Ð·Ð»Ñ?Ñ?Ñ?Ð½Ð½Ðµ Ð· Ñ?ÐµÑ?ÐºÐ°Ð¹ Tor, Ð°Ð»Ñ?Ð±Ð¾ Ñ?Ðº-Ð½ÐµÐ±Ñ?Ð´Ð·Ñ?\nÐ¿Ð°-Ñ?Ð½Ñ?Ð°Ð¼Ñ? Ñ?Ñ?Ð½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ð³Ð¾?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð±Ñ?Ñ?Ñ?Ñ?Ðµ \"Ð¢Ð°Ðº\" Ð° Ð·Ð°Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð°Ð»ÐµÐ¹\". Ð?Ð°Ð± Ð½Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?ÐºÐ°Ð¿Ñ?Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÑ?Ñ?Ñ?Ð°Ñ?Ñ?Ðµ Ñ?Ð°Ð´ÐºÑ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? Ñ? Ñ?Ñ?ÐºÑ?Ñ?Ð°Ð²Ð°Ðµ Ð²Ð°ÐºÐµÐ½Ñ?Ð°. Ð?Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ð°\"\nÑ? Ð¼Ð¾Ð¶Ð°Ñ?Ðµ Ð¿Ð°Ñ?Ñ?Ð½Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð°Ð¼. Ð?Ð°Ð»Ñ? Ð²Ñ? Ñ?Ñ?Ñ?Ñ?ÐºÐ½Ñ?Ð»Ñ?Ñ?Ñ? Ð· Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ð°Ð¼Ñ?,\nÐ¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°\" Ñ? Ð²Ð°ÐºÐµÐ½Ñ?Ñ? \"Ð¡ÐµÑ?ÐºÐ°Ð²Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Tor\" ÐºÐ°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼ÐºÑ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð³Ñ?Ñ?Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ? Ð½Ð° Pluggable Transport Ð°Ð´ TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¿Ñ?Ñ? Ð¿Ñ?Ð±Ð»Ñ?Ñ?Ð½Ð°Ð³Ð° GnuPG-ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
index 9a0d45a..3b60af7 100644
--- a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # aramaic <aramaicbg@xxxxxxxxx>, 2015
@@ -11,116 +11,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð¡Ñ?Ð¶Ð°Ð»Ñ?Ð²Ð°Ð¼Ðµ! Ð?ÐµÑ?Ð¾ Ñ?Ðµ Ð¾Ð±Ñ?Ñ?ÐºÐ° Ñ? Ð·Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð²Ð¸."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð·Ð¸Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð?Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð¡Ð¾Ñ?Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð·Ð±eÑ?Ð¸ Ð²Ñ?Ð¸Ñ?ÐºÐ¾"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR Ð?Ð¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Ð?Ð¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð»Ð¸Ð½Ð¸Ð¸"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?Ð¾Ð¾, Ñ?Ð¿Ð°Ð³ÐµÑ?ÐºÐ¸!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ðµ Ð¸Ð¼Ð°Ð»Ð¾ Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ð°Ñ?Ð¸Ñ? QR Ð?Ð¾Ð´."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð¢Ð¾Ð·Ð¸ QRCode Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸. Ð¡ÐºÐ°Ð½Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð³Ð¾ Ñ? QR Ð?Ð¾Ð´ Ñ?ÐµÑ?ÐµÑ? Ð´Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸ ÐºÑ?Ð¼ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ bridges ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð°Ð¹ Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° %s Ñ?Ðµ Ð²Ñ?Ñ?Ð½ÐµÑ?Ðµ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ð·Ð»Ð¸Ñ?ÐµÐ½t bridge Ñ?Ð¸Ð¿!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡Ð²Ð°Ð»Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð·ÐµÐ¼Ð¸ %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
@@ -129,27 +144,27 @@ msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð¼Ð¸ Ð´Ð°Ð¹Ñ?Ðµ bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð Ð°Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°!"
@@ -157,69 +172,37 @@ msgstr "%sÐ?%sÐ°!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ·ÐµÐ¼Ð¸ Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ; Ð¼Ð¾Ð»Ñ? Ð½Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð°Ñ?Ñ?Ð¹Ñ?Ðµ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð¢Ð¾Ð²Ð° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð¸ bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð°Ð´Ñ?Ð²Ñ?Ñ?Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ñ? Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ð·Ð° Ðµ-Ð¿Ð¾Ñ?Ð° . Ð?Ð¾Ð»Ñ? Ð·Ð°Ð±Ð°Ð²ÐµÑ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ? Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ð¼ÐµÐ¶Ð´Ñ? Ð´Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ð¸ Ðµ %s Ñ?Ð°Ñ?Ð°. Ð?Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ð»ÐµÐ´Ð²Ð°Ñ?Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð¸ Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ñ?Ðµ Ð±Ñ?Ð´Ð°Ñ? Ð°Ð½Ñ?Ð»Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ?Ð°Ð¹ COMMANDs Ð·Ð° Ð´Ð° Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ? Ð¼Ñ?Ð»Ñ?Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸ ÐµÐ´Ð½Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?Ð¾Ð±Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¸ Ð² BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð?ÐºÑ?Ñ?Ð°Ð»Ð½Ð¸ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð¥ÐµÐ¹, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²ÐµÐ¹, Ð¿Ñ?Ð¸Ñ?Ñ?ÐµÐ»!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ ÐºÐ»Ñ?Ñ?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð¢Ð¾Ð·Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð° Ð±ÐµÑ?Ðµ Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð°Ð½Ð° Ñ? Ð´Ñ?Ð³Ð¸, ÐµÐ´Ð½Ð¾Ñ?Ð¾Ð·Ð¸, Ð¸ Ð·Ð°Ñ?Ñ?\nÐ·Ð°  %s Ð² %s Ð² %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶Ð¸ bridges Ñ? Ð¼Ð½Ð¾Ð³Ð¾ %sÐ²Ð¸Ð´Ð¾Ð²Ðµ Ð½Ð° Pluggable Transports%s,\nÐºÐ¾Ð¸Ñ?Ð¾ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð´Ñ?Ð¸Ð³Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° ÐºÑ?Ð¼ Tor Network, Ð¿Ñ?Ð°Ð²ÐµÐ¹ÐºÐ¸ Ñ? Ð¿Ð¾\nÑ?Ñ?Ñ?Ð´Ð½Ð° Ð·Ð° Ð½Ð°Ð±Ð»Ñ?Ð´ÐµÐ½Ð¸Ðµ Ð·Ð° Ð²Ñ?ÐµÐºÐ¸ Ð½Ð°Ð±Ð»Ñ?Ð´Ð°Ð²Ð°Ñ? Ð²Ð°Ñ?Ð¸Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð´Ð° Ð¾Ñ?ÐºÑ?Ð¸Ðµ Ñ?Ðµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Tor\n \n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,7 @@ msgstr "Ð?Ñ?ÐºÐ¾Ð¹ bridges Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸ Ñ?Ð° Ñ?Ñ?Ñ?Ð¾ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸, Ð½
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ· Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸\nPluggable Transports %s ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ? Ñ?Ð¾Ð»ÐºÐ¾Ð²Ð° Ð´Ð¾Ð±Ñ?Ðµ, Ð½Ð¾ Ð²Ñ?Ðµ Ð¿Ð°Ðº Ð¼Ð¾Ð³Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð² Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð?Ð°ÐºÐ²Ð¾ Ñ?Ð° bridges?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Ñ?Ð° Tor relays ÐºÐ¾Ð¸Ñ?Ð¾ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð°."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° bridges!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° bridges Ðµ Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s. Ð?Ð¾Ð»Ñ? Ð¾Ñ?Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ, Ñ?Ðµ Ð²Ð¸Ðµ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð°\nÐ¸Ð·Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÐºÐ¸ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° ÐµÐ´Ð¸Ð½ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ñ?Ð¸:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ bridges Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ?! Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ð²Ð°Ñ?Ð¸Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð»ÐºÐ¾Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹, Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ñ?Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð°\nbridges Ð¸ Pluggable Transports ÐºÐ¾Ð¸Ñ?Ð¾ Ñ?Ñ?Ðµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸, Ð²Ð°Ñ?Ð°Ñ?Ð° Tor Browser Ð²ÐµÑ?Ñ?Ð¸Ñ?,\nÐ¸ Ð²Ñ?Ñ?ÐºÐ¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ñ? ÐºÐ¾ÐµÑ?Ð¾ Tor Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ð», Ð¸ Ñ?.Ð½."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð¢Ñ?Ñ? Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð²Ñ?Ñ?Ð·ÐºÐ¸:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ð·ÐµÐ¼ÐµÑ?Ðµ Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?Ð¸Ñ?Ð¾"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ñ? Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð¸Ð´ bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð·Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ñ?Ðµ Ð¾Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð¾Ñ? Ð³Ð¾Ñ?Ðµ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð?Ð° Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° bridges Ð² Tor Browser, Ð¿Ñ?Ñ?Ð²Ð¾ Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° \n%s Tor Browser Ñ?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ %s Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° \nÑ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° \nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ð½Ðµ Ð¿Ð¾Ð¿Ð¸Ñ?Ð°:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð¦ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð»Ð¸ Ð¸Ð»Ð¸ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð²Ð¸ Ð²Ð°Ñ?Ð¸Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº (ISP)\nÐ´Ð¾ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð°Ð¿Ñ?ÐµÐ´'. Ð?Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ bridges, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¸\nÐ¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ bridge Ñ?ÐµÐ´Ð¾Ð²ÐµÑ?Ðµ Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾ Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ. Ð?Ð° ÐºÑ?Ð°Ñ? Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ 'Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ', Ð¸\nÑ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð´Ð½Ð¾Ñ?Ñ?Ð¸, Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?' Ð±Ñ?Ñ?Ð¾Ð½Ð° Ð²  'Tor Network Settings' Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸ÐµÑ?Ð¾."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ñ?Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸ bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ñ?Ð²Ð¸ IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ñ?Ð²Ð¸ Pluggable Transport Ñ?Ð¿Ð¾Ñ?ÐµÐ´ TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ð·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ðµ Ð½Ð° BridgeDB's Ð¾Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ GnuPG ÐºÐ»Ñ?Ñ?."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
index 1cdc028..9da826f 100644
--- a/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,9 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
+# Al Shahrior Hasan Sagor <shahrior3814@xxxxxxxxx>, 2019
 # code smite <codesmite@xxxxxxxxx>, 2018
 # Humayun Rashid <reporterhr@xxxxxxxxx>, 2019
 # Mahmud Numan <mahmudnuman@xxxxxxxxx>, 2016-2017
@@ -14,116 +14,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-25 11:00+0000\n"
-"Last-Translator: Tasneem Khalil <tasneem.khalil@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¦¦à§?à¦?à¦?à¦¿à¦¤! à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§à§? à¦?à¦¿à¦?à§? à¦à§?à¦² à¦¹à¦¯à¦¼à§?à¦?à§?à¥¤"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¦à¦¾à¦·à¦¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "à¦?à¦?à¦?à¦¿ à¦¤à§?à¦°à§?à¦?à¦¿ à¦°à¦¿à¦ªà§?à¦°à§?à¦? à¦?à¦°à§?à¦¨"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "à¦¸à§?à¦°à§?à¦¸ à¦?à§?à¦¡"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨à§?à¦° à¦¤à¦¾à¦²à¦¿à¦?à¦¾"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¦¯à§?à¦?à¦¾à¦¯à§?à¦?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¦¸à¦¬ à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR à¦?à§?à¦¡ à¦¦à§?à¦?à§?à¦¨"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦²à¦¾à¦?à¦¨ à¦?à¦¨à§?à¦¯ QR à¦?à§?à¦¡"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "à¦§à§?à¦°! à¦?à§?à¦¥à¦¾à§? à¦¯à§?à¦¨à§? à¦?à¦¾à¦®à§?à¦²à¦¾ à¦¹à¦?à§?à¦?à§?"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¦®à¦¨à§? à¦¹à¦?à§?à¦?à§? à¦?à¦ªà¦¨à¦¾à¦° â??QR à¦?à§?à¦¡ à¦ªà§?à¦¤à§? à¦?à§?à¦¥à¦¾à¦? à¦?à¦¾à¦®à§?à¦²à¦¾ à¦¹à§?à§?à¦?à§?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¦?à¦? QR à¦?à§?à¦¡à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¦à§?à§?à¦¾ à¦?à¦?à§?, à¦®à§?à¦¬à¦¾à¦?à¦² à¦?à¦¥à¦¬à¦¾ à¦¯à§?à¦?à§?à¦¨ à¦¡à¦¿à¦à¦¾à¦?à¦¸à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦?à¦ªà¦¿ à¦?à¦°à¦¤à§? à¦?à¦? QR à¦?à§?à¦¡ à¦?à§?à¦?à§? à¦¸à§?à¦?à§?à¦¯à¦¾à¦¨ à¦?à¦°à§?à¦¨ à¥¤"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦?à§?à¦¨ à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¸à¦¹à¦?à¦²à¦à§?à¦¯ à¦¨à§?à¦?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¦¹à§?à¦¤à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¿à§? %s à¦¤à§? à¦«à¦¿à¦°à§? à¦¯à¦¾à¦?à§?à¦¾ à¦?à¦¬à¦?  %s à¦à¦¿à¦¨à§?à¦¨ à¦§à¦°à§?à¦®à§? à¦¸à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à¦¾ "
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¦§à¦¾à¦ª %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¦§à¦¾à¦ª %s 2 %s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¦?à§?à¦? %s à¦¬à§?à¦°à¦¿à¦?  %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¦§à¦¾à¦ª %s 3 %s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¦?à¦?à¦¨ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦¯à§?à¦?à§?à¦¤ à¦?à¦°à§?à¦¨%s"
@@ -132,27 +147,27 @@ msgstr "à¦?à¦?à¦¨ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦¯à§?
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ %s à¦?à¦®à¦¾à¦?à§? à¦¶à§?à¦§à§?  à¦¬à§?à¦°à¦¿à¦? à¦¦à¦¾à¦?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¦?à¦¨à§?à¦¨à¦¤ à¦¬à¦¿à¦?à¦²à§?à¦ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¦¨à¦¾"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¦?à§?à¦¨à§?à¦?à¦¾ à¦¨à¦¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s %s à¦¹à§?à¦¯à¦¾à¦?"
@@ -160,69 +175,37 @@ msgstr "%s %s à¦¹à§?à¦¯à¦¾à¦?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[à¦?à¦?à¦¿ à¦?à¦?à¦?à¦¿ à¦¸à§?à¦¬à¦¯à¦¼à¦?à¦?à§?à¦°à¦¿à¦¯à¦¼ à¦¬à¦¾à¦°à§?à¦¤à¦¾; à¦¦à¦¯à¦¼à¦¾ à¦?à¦°à§? à¦ªà§?à¦°à¦¤à§?à¦¯à§?à¦¤à§?à¦¤à¦° à¦¦à§?à¦¬à§?à¦¨ à¦¨à¦¾ à¥¤]  "
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦?à¦?à§?à¦²à¦¿:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "à¦?à¦ªà¦¨à¦¿ à¦¹à¦¾à¦° à¦¸à§?à¦®à¦¾ à¦?à¦¤à¦¿à¦?à§?à¦°à¦® à¦?à¦°à§?à¦?à§?à¦¨ à¦®à¦¨à§?à¦¥à¦° à¦¨à¦¿à¦?à§? à¦?à¦°à§?à¦¨! à¦®à¦§à§?à¦¯à§? à¦¸à¦°à§?à¦¬à¦¨à¦¿à¦®à§?à¦¨ à¦¸à¦®à¦¯à¦¼\nà¦?à¦®à§?à¦²à¦?à§?à¦²à¦¿ %s à¦?à¦¨à§?à¦?à¦¾à¥¤ à¦?à¦? à¦¸à¦®à¦¯à¦¼à§?à¦° à¦®à¦§à§?à¦¯à§? à¦?à¦°à¦? à¦?à¦¨à§?à¦¯à¦¾à¦¨à§?à¦¯ à¦?à¦®à§?à¦² à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à¦¾ à¦¹à¦¬à§?à¥¤"
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (à¦?à¦?à¦¯à§?à¦?à§? à¦?à¦?à¦¾à¦§à¦¿à¦? à¦¬à¦¿à¦?à¦²à§?à¦ª à¦?à¦²à§?à¦²à§?à¦? à¦?à¦°à¦¤à§? COMMANDs à¦?à¦?à¦¤à§?à¦°à¦¿à¦¤ à¦?à¦°à§?à¦¨)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB à¦¤à§? à¦¸à§?à¦¬à¦¾à¦?à¦¤à¦®!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦ªà¦°à¦¿à¦¬à¦¹à¦¨ à¦ªà§?à¦°à¦?à¦¾à¦°:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "à¦?à¦°à§?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "à¦?à¦¹à§? à¦¬à¦¨à§?à¦§à§?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "à¦ªà¦¾à¦¬à¦²à¦¿à¦? à¦?à§?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "à¦?à¦? à¦?à¦®à§?à¦²à¦?à¦¿ rainbows, unicorns, à¦?à¦¬à¦? sparkles à¦¦à¦¿à¦¯à¦¼à§? à¦¤à§?à¦°à¦¿ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼à§?à¦?à¦¿à¦²\n%s. à¦¤à§? %s %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +216,7 @@ msgid ""
 msgstr "BridgeDB à¦¬à¦¿à¦à¦¿à¦¨à§?à¦¨ %s à¦§à¦°à¦¨à§?à¦° à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦? %s à¦¸à¦?à§?à¦?à§? à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦°à¦¦à¦¾à¦¨ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?à¦¨,\nà¦¯à¦¾ à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à¦?à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à¦?à¦¯à§?à¦?à¦?à§?à¦²à¦¿ à¦?à¦ªà§?à¦°à¦¤à¦¿à¦°à§?à¦§à§?à¦¯ à¦?à¦°à¦¤à§? à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾ à¦?à¦°à§?, à¦?à¦?à¦¿ à¦?à¦°à¦? à¦¬à§?à¦¶à¦¿ à¦?à¦°à§? à¦¤à§?à¦°à¦¿ à¦?à¦°à§?\nà¦¯à§? à¦?à§?à¦? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦?à§?à¦°à§?à¦¯à¦¾à¦«à¦¿à¦?à¦?à¦¿ à¦¦à§?à¦?à§? à¦?à¦ªà¦¨à¦¾à¦° à¦ªà¦?à§?à¦·à§? à¦¤à¦¾ à¦¨à¦¿à¦°à§?à¦§à¦¾à¦°à¦£ à¦?à¦°à¦¾ à¦?à¦ à¦¿à¦¨\nà¦?à¦° à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§?\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -245,7 +228,7 @@ msgstr "à¦?à¦¿à¦?à§? à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦®à¦¾à¦§à§?à¦¯à¦®à§? à¦?à¦?
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +237,169 @@ msgid ""
 "\n"
 msgstr "à¦?à¦ªà¦°à¦¨à§?à¦¤à§?, à¦¬à§?à¦°à¦¿à¦?à¦¡à¦¿à¦¬à¦¿ à¦?à¦° à¦®à¦§à§?à¦¯à§? à¦ªà§?à¦°à¦?à§?à¦° à¦ªà§?à¦²à§?à¦?à¦¨-à¦à§?à¦¯à¦¾à¦²à¦¿-à¦à§?à¦¯à¦¾à¦¨à¦¿à¦²à¦¾ à¦¬à§?à¦°à¦¿à¦? %s à¦°à¦¯à¦¼à§?à¦?à§?\nà¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦? %s à¦¯à¦¾ à¦¹à¦¯à¦¼à¦¤à§? à¦ à¦¾à¦¨à§?à¦¡à¦¾ à¦¬à¦²à§? à¦®à¦¨à§? à¦?à¦°à§? à¦¨à¦¾, à¦¤à¦¬à§? à¦¤à¦¾à¦°à¦¾ à¦?à¦?à¦¨à¦? à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?\nà¦?à¦¨à§?à¦? à¦?à§?à¦·à§?à¦¤à§?à¦°à§? à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦¸à§?à¦¨à§?à¦¸à¦°à¦¶à¦¿à¦ªà¦?à§? à¦¬à¦¾à¦§à¦¾ à¦¦à¦¿à¦¤à§? à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "à¦¬à§?à¦°à¦¿à¦? à¦?à¦¿ ?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s à¦¬à§?à¦°à¦¿à¦?à§?à¦¸ %s à¦?à¦° à¦°à¦¿à¦²à§? à¦¯à¦¾ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¸à§?à¦¨à§?à¦¸à¦°à¦¶à¦¿à¦ªà¦?à§? à¦¬à¦¾à¦§à¦¾ à¦¦à¦¿à¦?à§?à¦?à§?à¥¤"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "à¦¬à§?à¦°à¦¿à¦?à§?à¦° à¦¬à§?à¦¯à¦¬à¦¸à§?à¦¥à¦¾ à¦?à¦°à¦¾à¦° à¦?à¦?à¦?à¦¾ à¦¬à¦¿à¦?à¦²à§?à¦ª à¦?à¦ªà¦¾à¦¯à¦¼ à¦¦à¦°à¦?à¦¾à¦°!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦¤à§? à¦?à¦°à§?à¦?à¦?à¦¿ à¦?à¦ªà¦¾à¦¯à¦¼ à¦¹à¦² %s à¦¥à§?à¦?à§? à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦² à¦ªà¦¾à¦ à¦¾à¦¨à§?à¥¤ à¦¦à¦¯à¦¼à¦¾ à¦?à¦°à§? à¦®à¦¨à§? à¦°à¦¾à¦?à¦¬à§?à¦¨ à¦¯à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦¬à¦¶à§?à¦¯à¦?\nà¦¨à¦¿à¦®à§?à¦¨à§?à¦?à§?à¦¤ à¦?à¦®à§?à¦² à¦ªà§?à¦°à¦¦à¦¾à¦¨à¦?à¦¾à¦°à§?à¦¦à§?à¦° à¦®à¦§à§?à¦¯à§? à¦?à¦?à¦?à¦¿ à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§? à¦?à¦®à§?à¦² à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¹à¦¬à§?: %s\n, %s à¦¬à¦¾ %sà¥¤"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "à¦?à¦®à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦? à¦?à¦°à¦?à§? à¦¨à¦¾! à¦?à¦®à¦¾à¦° à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦¦à¦°à¦?à¦¾à¦°!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¾à¦° Tor à¦?à¦¾à¦? à¦¨à¦¾ à¦?à¦°à§?, à¦¤à¦¬à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦² à¦?à¦°à¦¾ à¦?à¦?à¦¿à§? %sà¥¤"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à¦¤à¦¾à¦²à¦¿à¦?à¦¾à¦?à¦¿ à¦¸à¦¹ à¦?à¦ªà¦¨à¦¾à¦° à¦?à§?à¦¸ à¦¹à¦¿à¦¸à¦¾à¦¬à§? à¦¯à¦¤à¦?à¦¾ à¦¤à¦¥à§?à¦¯ à¦?à¦¨à§?à¦¤à¦°à§?à¦à§?à¦?à§?à¦¤ à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨,\nà¦¸à§?à¦¤à§? à¦?à¦¬à¦? à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦«à¦°à§?à¦®à¦?à§?à¦²à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦?à§?à¦¨, à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦¸à¦?à¦¸à§?à¦?à¦°à¦£,\nà¦?à¦¬à¦? à¦?à¦° à¦¦à¦¿à¦¯à¦¼à§?à¦?à§?à¦¨ à¦?à¦®à¦¨ à¦?à§?à¦¨ à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦?à¦¤à§?à¦¯à¦¾à¦¦à¦¿à¥¤"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¾à¦° Tor Browser à¦¸à¦?à¦¯à§?à¦? à¦¨à¦¾ à¦¹à¦²à§?, à¦¦à¦¯à¦¼à¦¾ à¦?à¦°à§? %sà¦?à¦¬à¦? à¦?à¦®à¦¾à¦¦à§?à¦° %sà¦? à¦?à¦?à¦¬à¦¾à¦° à¦¦à§?à¦?à§?à¦¨à¥¤"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦?à¦?à§?à¦²à¦¿:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "à¦?à§?à¦¨à¦?à¦¿ à¦¨à¦¾"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦?à¦ª à¦?à¦° à¦?à¦¨à§?à¦¯ à¦¬à¦¿à¦?à¦²à§?à¦ª à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¿ IPv6 à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¦?à¦ªà¦¨à¦¿ à¦?à¦¿ à¦?à¦?à¦?à¦¿ %s à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¸à¦ à¦¿à¦?à¦à¦¾à¦¬à§? à¦?à¦®à§?à¦? à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¨ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼ à¦¨à¦¾à¥¤"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "à¦?à¦ªà¦°à§?à¦° à¦?à¦¿à¦¤à§?à¦° à¦¥à§?à¦?à§? à¦?à¦?à§?à¦·à¦° à¦?à§?à¦²à¦¿ à¦²à¦¿à¦?à§?à¦¨ ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "à¦?à¦¿à¦à¦¾à¦¬à§? à¦¬à§?à¦°à¦¿à¦? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦¶à§?à¦°à§? à¦?à¦°à¦¬à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦°à¦¬à§?à¦¶ à¦?à¦°à¦¤à§?, à¦ªà§?à¦°à¦¥à¦®à§? %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨\nà¦ªà§?à¦·à§?à¦ à¦¾ %s à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦¬à¦? à¦¶à§?à¦°à§? à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦¸à§?à¦?à¦¾à¦¨à§? à¦¨à¦¿à¦°à§?à¦¦à§?à¦¶à¦¾à¦¬à¦²à§? à¦?à¦¨à§?à¦¸à¦°à¦£ à¦?à¦°à§?à¦¨\nà¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "à¦¯à¦?à¦¨ 'à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸' à¦¸à¦?à¦²à¦¾à¦ª à¦ªà¦ª à¦?à¦ª, 'à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦°' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦?à¦¨à§?à¦¸à¦°à¦£ à¦?à¦°à§?à¦¨\nà¦?à¦?à¦?à¦¾à¦°à§?à¦¡ à¦¯à¦¤à¦?à§?à¦·à¦£ à¦¨à¦¾ à¦?à¦¿à¦?à§?à¦?à¦¾à¦¸à¦¾ à¦?à¦°à§?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦¸à¦¾à¦°à§?à¦à¦¿à¦¸ à¦ªà§?à¦°à§?à¦à¦¾à¦?à¦¡à¦¾à¦° (à¦?à¦?à¦?à¦¸à¦ªà¦¿) à¦¬à§?à¦²à¦? à¦¬à¦¾ à¦?à¦¨à§?à¦¯à¦¥à¦¾à¦¯à¦¼ à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¨à§?à¦¸à¦° à¦?à¦°à§? à¦¨à¦¾\nà¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¥à§?à¦?à§??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'à¦¹à§?à¦¯à¦¾à¦?' à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° 'à¦ªà¦°à¦¬à¦°à§?à¦¤à§?' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦ªà¦¨à¦¾à¦° à¦¨à¦¤à§?à¦¨ à¦¸à§?à¦¤à§? à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦° à¦?à¦°à¦¤à§?, à¦?à¦ªà¦¿ à¦?à¦¬à¦?\nà¦?à§?à¦?à§?à¦¸à¦? à¦?à¦¨à¦ªà§?à¦? à¦¬à¦¾à¦?à§?à¦¸à§? à¦¸à§?à¦¤à§? à¦²à¦¾à¦?à¦¨ à¦?à¦?à¦?à¦¾à¦¨à¥¤ à¦?à¦¬à¦¶à§?à¦·à§?, 'à¦¸à¦?à¦¯à§?à¦?à§?à¦¤' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨, à¦?à¦¬à¦?\nà¦?à¦ªà¦¨à¦¿ à¦¯à§?à¦¤à§? à¦à¦¾à¦² à¦¹à¦¤à§? à¦¹à¦¬à§?! à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦¯à¦¼ à¦ªà¦¡à¦¼à§?à¦¨ à¦¤à¦¬à§? 'à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨\nà¦?à¦°à¦? à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾ à¦?à¦¨à§?à¦¯ 'à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸' à¦?à¦?à¦?à¦¾à¦°à§?à¦¡ à¦®à¦§à§?à¦¯à§? à¦¬à¦¾à¦?à¦¨"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "à¦?à¦? à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¿à¦¤ à¦?à¦°à§?"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "à¦à§?à¦¯à¦¾à¦¨à¦¿à¦²à¦¾ à¦¬à§?à¦°à§?à¦?à¦¸à¦®à§?à¦¹à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 à¦¬à§?à¦°à¦¿à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE à¦¦à§?à¦¬à¦¾à¦°à¦¾ à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB à¦?à¦° à¦¸à¦¾à¦°à§?à¦¬à¦?à¦¨à§?à¦¨ GnuPG à¦?à§?-à§?à¦?à¦° à¦?à¦?à¦?à¦¿ à¦?à¦¨à§?à¦²à¦¿à¦ªà¦¿ à¦ªà¦¾à¦¨à¥¤"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..2aee18d
--- /dev/null
+++ b/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Amar Memisevic <factoryamar@xxxxxxxxx>, 2019-2020
+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-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: 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."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Prijavi greÅ¡ku"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Izvorni kod"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Promjene"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄ?i sve"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "PrikaÅ¾i QR kod"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kod za vaÅ¡u briÄ? liniju"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ä?ini se da je doÅ¡lo do pogreÅ¡ke prilikom dostavljanja vaÅ¡eg QRCode."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ovaj QRCode sadrÅ¾i linije briÄ?a. Skenirajte ga QRCode Ä?itaÄ?em kako biste kopirali svoje briÄ?eve linije na mobilne i druge ureÄ?aje."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Trenutno nema dostupnih briÄ?eva ..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "MoÅ¾da biste trebali pokuÅ¡ati %s vratiti se %s i odabrati drugu vrstu mosta!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Korak %s 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Preuzmi %s Tor PretraÅ¾ivaÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Korak %s2%s "
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Uzmi %s briÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Korak %s3%s "
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sada %s dodajte briÄ?eve Tor pretraÅ¾ivaÄ?u %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%samo mi daj briÄ?eve!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Napredne Opcije"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "NiÅ¡ta"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sDa%s!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sU%szmi BriÄ?eve"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Evo vaÅ¡ih briÄ?eva:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "PrekoraÄ?ili ste ograniÄ?enje stope. Molimo vas usporite! Minimalno vrijeme izmeÄ?u\ne-mailovi su %s sati. Sva daljnja e-poÅ¡ta u ovom vremenskom periodu bit Ä?e zanemarena."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB moÅ¾e pruÅ¾iti mostove s nekoliko%svrsta Pluggable transport'a%s,\nÅ¡to moÅ¾e pomoÄ?i zamagli vaÅ¡e veze sa Tor mreÅ¾e, Å¡to je viÅ¡e\nsvima koji gledaju vaÅ¡ internetski promet teÅ¡ko je utvrditi kakvi ste\nkoristeÄ?i Tor.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Dostupni su i neki briÄ?evi s IPv6 adresama, iako su neki Modularni\nTranspori nisu IPV6 kompatibilni.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Å ta su Mostovi ?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "NiÅ¡ta"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
index f169b0e..5d29542 100644
--- a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
@@ -1,158 +1,175 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Albert <provisionalib@xxxxxxxxxxx>, 2013
-# Assumpta <assumptaanglada@xxxxxxxxx>, 2014
+# Assumpta, 2014
+# Benny Beat <bennybeat@xxxxxxxxx>, 2019-2020
 # Eloi GarcÃa i Fargas, 2014
 # Humbert, 2014
 # isis <isis@xxxxxxxxxxxxxx>, 2015
+# jmontane, 2019-2020
 # laia_, 2014-2015
 # Toni Hermoso Pulido <toniher@xxxxxxxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Quelcom ha anat malament amb la peticiÃ³."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Llengua"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Comunica un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Codi font"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Registre de canvis"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacte"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostra el codi QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Codi QR per les lÃnies de ponts"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Vatua l'olla!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Hi ha hagut un error en obtenir el codi QR"
+msgstr "S'ha produÃ¯t un error en obtenir el codi QR"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mÃ²bil i a altres dispositius. "
+msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escanegeu-lo amb un lector de codis QR per a copiar les lÃnies de pont al mÃ²bil i a altres dispositius. "
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
-msgstr "No hi ha ponts disponibles en aquests moments."
+msgstr "No hi ha cap pont disponible en aquests moments."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Pas %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Descarrega %s Navegador Tor %s"
+msgstr "Baixeu el %s navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Pas %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Descarrega %s ponts %s"
+msgstr "Baixeu els %s ponts %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pas %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ara %s adjunta els ponts al Tor Browser %s"
+msgstr "Ara %s adjunteu els ponts al navegador Tor %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust donem els meus bridges!"
+msgstr "%sN%somÃ©s dÃ³na'm els ponts!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
-msgstr "Opcions AvanÃ§ades"
+msgstr "Opcions avanÃ§ades"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Cap"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ!"
@@ -160,69 +177,37 @@ msgstr "%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sD%sescarrega Bridges"
+msgstr "%sB%saixa els ponts"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Aquest Ã©s un missatge automÃ tic, no el respongui.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Els vostres ponts: "
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Heu superat el lÃmit. El mÃnim de temps entre\nels correus Ã©s de %s hores. La resta de correus durant aquest perÃode de temps seran ignorats."
+msgstr "Heu superat el lÃmit. El mÃnim de temps entre\nels correus Ã©s de %s hores. S'ingorarÃ  a resta de correus durant aquest perÃode de temps."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultÃ niament)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Benvingut a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Actualment suportant transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hola, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hola, amic!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claus PÃºbliques"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant MartÃ i espurnes\nper a %s el %s a les %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,158 +215,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB pot proveÃ¯r ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexiÃ³ a Tor Network, fent mÃ©s difÃcil determinar que esteu usant Tor a qualsevol que vegi el vostre trÃ fic de connexiÃ³ a\ninternet. \n"
+msgstr "El BridgeDB pot proveir ponts entre diversos %stipus de transports extensibles%s, que poden ajudar a ofuscar la vostra connexiÃ³ en la xarxa\nTor, fent mÃ©s difÃcil de determinar que esteu usant Tor a qualsevol\nque vegi el vostre trÃ nsit de connexiÃ³ a internet.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "TambÃ© hi ha ponts disponibles amb adreces IPv6, tot i que alguns Pluggable\nTransports no sÃ³n compatibles amb IPv6.\n\n"
+msgstr "TambÃ© hi ha ponts disponibles amb adreces IPv6, tot i que alguns transports extensibles no sÃ³n compatibles amb IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "A mÃ©s a mÃ©s, BridgeDB tÃ© molts ponts %s estÃ ndard sense \nPluggable Transports %s, que potser no sÃ³n tan interessants, perÃ² que tambÃ©\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
+msgstr "A mÃ©s a mÃ©s, el BridgeDB tÃ© molts ponts %s estÃ ndard sense \ntransports extensibles%s, que potser no sÃ³n tan interessants, perÃ² que tambÃ©\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "QuÃ¨ sÃ³n els ponts?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ponts %s sÃ³n repetidors Tor que ajuden a esquivar la censura."
+msgstr "Els %s ponts %s sÃ³n repetidors Tor que ajuden a esquivar la censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr "Em cal una manera alternativa d'obtenir ponts."
+msgstr "Em cal una manera alternativa per a obtenir ponts."
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Una altra manera d'aconseguir ponts Ã©s enviar un correu electrÃ²nic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreÃ§a d'un dels segÃ¼ents proveÃ¯dors de correu:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Una altra forma d'obtenir ponts Ã©s enviar un correu electrÃ²nic a %s. Deixeu l'assumpte del correu en blanc i escriviu Â«get transport obfs4Â» en el cos del missatge del correu. Tingueu en compte que cal que envieu el missatge fent servir una adreÃ§a d'algun dels proveÃ¯dors de correu segÃ¼ents: %s o %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
-msgstr "No em funcionen els ponts! Ajuda!"
-
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, envieu un correu a %s."
+msgstr "No em funcionen els ponts; necessito ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Incloeu el mÃ xim d'informaciÃ³ sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versiÃ³ de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si el navegador Tor no pot connectar, doneu una ullada al %s i al %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Les vostres lÃnies de ponts:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr "Descarregueu ponts!"
+msgstr "Baixa els ponts!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Sistemes de distribuciÃ³ de ponts"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementa quatre sistemes per a distribuir ponts: Â«HTTPSÂ», Â«MoatÂ», Â«Correu electrÃ²nicÂ» i Â«ReservatÂ». Els ponts que no es distribueixen per BridgeDB usen el pseudomecanisme Â«CapÂ». La llista segÃ¼ent explia breumetn com funcionen aquests mecanismes i les %smÃ¨triques de BridgeDB%s mostren la popularitat de cadascun d'aquests mecanismes."
+
+#: bridgedb/strings.py:115
+#, 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 "El sistema de distribuciÃ³ Â«HTTPSÂ» deixa els ponts en mans d'aquest lloc web. Per a obtenir ponts, aneu a %sbridges.torproject.org%s, seleccioneu les opcions preferents i resolgueu el CAPTCHA corresponent."
+
+#: bridgedb/strings.py:119
+#, 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:125
+#, 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 "Els usuaris poden solÂ·licitar ponts des del sistema de distribuciÃ³ Â«Correu electrÃ²nicÂ» enviant un correu a %sbridges@xxxxxxxxxxxxxx%s i escrivint Â«get transport obfs4Â» en el cos del missatge."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservat"
+
+#: bridgedb/strings.py:130
+#, 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 mantÃ© un petit nombre de ponts que no es distribueixen automÃ ticament. En comptes d'aixÃ², reservem aquests ponts per a distribuir-los manualment a ONG i altres organitzacions i persones que necessiten ponts. Els ponts que es distribueixen via el sistema Â«ReservatÂ» potser no veuen usuar per forÃ§a temps. Tingueu en compte que el sistema de distribuciÃ³ Â«ReservatÂ» s'anomena Â«UnallocatedÂ» en els fitxers d'%sassignaciÃ³ de ponts disponibles%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Cap"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Seleccioneu les opcions pel tipus de pont:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
-msgstr "Necessiteu adreces IPv6?"
+msgstr "Us calen adreces IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Necessiteu un %s?"
+msgstr "Us cal un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "El navegador no estÃ  mostrant les imatges correctament."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "IntroduÃ¯u els carÃ cters de la imatge superior..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Com comenÃ§ar a utilitzar els ponts"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pÃ gina de descÃ rrega\n%s i desprÃ©s seguir les instruccions per descarregar i iniciar\nel Tor Browser. "
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Quan aparegui el diÃ leg 'ConfiguraciÃ³ Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "El vostre ProveÃ¯dor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccioneu 'SÃ' i desprÃ©s cliqueu 'SegÃ¼ent'. Per configurar els ponts nous, copieu i\nenganxeu les lÃnies del pont al segÃ¼ent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botÃ³ \nd''Ajuda' a l'auxiliar de 'ConfiguraciÃ³ Xarxa Tor' per mÃ©s assistÃ¨ncia."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostra aquest missatge."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Demanar ponts estÃ ndard."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Demanar ponts IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demanar un Pluggable Transport per TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Descarregar una cÃ²pia de la clau pÃºblica GnuPG del BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
index 9a0e93e..3ef1411 100644
--- a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,17 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # A5h8d0wf0x <littleslyfoxie28@xxxxxxxxx>, 2014
 # Adam Slovacek <adamslovacek@xxxxxxxxx>, 2013
+# David Stepan <stepand@xxxxxxxxxx>, 2019
 # Elisa <valhalla@xxxxxxxxxxxxx>, 2011
 # Filip Hruska <fhr@xxxxxxxxx>, 2015
 # Sanky <gsanky+transifex@xxxxxxxxx>, 2011
 # JiÅ?Ã VÃrava <appukonrad@xxxxxxxxx>, 2014
-# Michal Stanke <mstanke@xxxxxxxxxx>, 2018
+# Michal Stanke <mstanke@xxxxxxxxxx>, 2018-2019
+# MikulÃ¡Å¡ Vrba <mikulasvrba@xxxxxxxxx>, 2020
 # mxsedlacek, 2014
 # Radek Bensch <inactive+Radog@xxxxxxxxxxxxx>, 2013
 # Tomas Palik, 2015
@@ -18,116 +20,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-10-25 18:02+0000\n"
-"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "NahlÃ¡sit chybu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Seznam zmÄ?n"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "OznaÄ?it vÅ¡e"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Zobrazit QR kÃ³d"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kÃ³d pro vaÅ¡e linky k mostÅ¯m"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "JeÅ¾ÃÅ¡ku na kÅ?ÃÅ¾ku!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "PÅ?i zpracovÃ¡nÃ vaÅ¡eho QR kÃ³du zÅ?ejmÄ? nastala chyba."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Tento QR kÃ³d obsahuje linky pro vÃ¡Å¡ most. Pro zkopÃrovÃ¡nÃ na mobilnÃ nebo jinÃ¡ zaÅ?ÃzenÃ naskenujte QR kÃ³d Ä?teÄ?kou."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "NynÃ nejsou k dispozici Å¾Ã¡dnÃ© mosty..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾nÃ¡ by jste mÄ?l zkusit %s jÃt zpÄ?t %s a vybrat jinÃ½ typ mostÅ¯!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "StÃ¡hnout %sprohlÃÅ¾eÄ? Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskat %s mosty %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
@@ -136,27 +153,27 @@ msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sen mi dejte mosty!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "RozÅ¡ÃÅ?enÃ¡ nastavenÃ"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Å¾Ã¡dnÃ©"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sA%sno!"
@@ -164,69 +181,37 @@ msgstr "%sA%sno!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastavit mosty"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Toto je automatickÃ¡ zprÃ¡va. NeodpovÃdejte na ni prosÃm.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Toto je automatickÃ½ email.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Zde jsou vaÅ¡e mosty:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "PÅ?ekroÄ?ili jste limit poÄ?tu poÅ¾adavkÅ¯. Zpomalte prosÃm. MinimÃ¡lnÃ Ä?as mezi e-maily je %s hodin. VÅ¡echny nÃ¡sledujÃcÃ e-maily bÄ?hem tÃ©to Ä?asovÃ© doby budou ignorovÃ¡ny."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "PÅ?Ã?KAZY: (kombinujte pÅ?Ãkazy pro zadÃ¡vÃ¡nÃ vÃce moÅ¾nostÃ souÄ?asnÄ?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "VÃtejte v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "V souÄ?asnosti podporovanÃ© transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ahoj, pÅ?Ãteli!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "VeÅ?ejnÃ© klÃÄ?e"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Tento duhovÃ½ e-mail plnÃ½ jednoroÅ¾cÅ¯ a hvÄ?zd byl generovÃ¡n pro %s dne %s v %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,7 +222,7 @@ msgid ""
 msgstr "BridgeDB mÅ¯Å¾e nabÃdnou mosty s nÄ?kolika %s typy Pluggable Transports%s,\ncoÅ¾ mÅ¯Å¾e zamaskovat vaÅ¡e pÅ?ipojenÃ k sÃti Tor a znesnadnit pro kohokoli\nsledovat vaÅ¡i internetovou aktivitu a urÄ?it, zda Tor pouÅ¾ÃvÃ¡te\nnebo nikoliv.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -249,7 +234,7 @@ msgstr "K dispozici jsou takÃ© nÄ?kterÃ© mosty s IPv6 adresami, pÅ?estoÅ¾e nÄ?kt
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -258,134 +243,169 @@ msgid ""
 "\n"
 msgstr "BridgeDB mÃ¡ takÃ© spoustu obyÄ?ejnÃ½ch mostÅ¯ %s bez Å¾Ã¡dnÃ½ch \nPluggable Transports %s. To sice nemusÃ znÃt tak super, ale poÅ?Ã¡d vÃ¡m mohou v mnoha pÅ?Ãpadech\npomoci obejÃt internetovou cenzuru.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Co jsou to mosty?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Mosty %s jsou uzly Toru, kterÃ© vÃ¡m pomÃ¡hajÃ obejÃt cenzuru."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "PotÅ?ebuji jinÃ½ zpÅ¯sob jak zÃskat most!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "DalÅ¡Ã zpÅ¯sob, jak zÃskat mosty, je poslat e-mail na %s. MÄ?jte prosÃm na pamÄ?ti, Å¾e musÃte poslat e-mail pouze ze schrÃ¡nky nÃ¡sledujÃcÃch poskytovatelÅ¯ e-mailovÃ½ch sluÅ¾eb:\n%s, %s nebo %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "MÃ© mosty nefungujÃ. PotÅ?ebuji pomoc!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud vÃ¡m Tor nefunguje, poÅ¡lete nÃ¡m e-mail na %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "NapiÅ¡te nÃ¡m co nejvÃce o vaÅ¡em problÃ©mu, vÄ?etnÄ? seznamu\nmostÅ¯ a pluggable Transports, kterÃ© jste se pokusili pouÅ¾Ãt, vaÅ¡i verzi prohlÃÅ¾eÄ?e Tor,\nvÅ¡echny zprÃ¡vy, kterÃ© jste od Toru zÃskali, atd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Pokud se vÃ¡Å¡ ProhlÃÅ¾eÄ? Tor nemÅ¯Å¾e pÅ?ipojit, pÅ?eÄ?tÄ?te si %s a %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Zde jsou vaÅ¡e linky k mostÅ¯m: "
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ZÃskat mosty!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "RezervovÃ¡no"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Å½Ã¡dnÃ©"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Vyberte ÃºrosÃm nastavenÃ pro typ mostu:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "PotÅ?ebujete IPv6 adresu?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "PotÅ?ebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prohlÃÅ¾eÄ? nezobrazuje sprÃ¡vnÄ? obrÃ¡zky."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Zadejte pÃsmena z obrÃ¡zku vÃ½Å¡e..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Jak zaÄ?Ãt pouÅ¾Ãvat mosty."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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Ã¡:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ?ipojenÃ (ISP) spojenÃ se sÃtÃ Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vyberte 'Ano' a potÃ© kliknÄ?te 'DalÅ¡Ã'. Pro nastavenÃ novÃ½ch mostÅ¯ zkopÃrujte a\nvloÅ¾te linky k mostÅ¯m do textovÃ©ho pole. Nakonec kliknÄ?te na 'PÅ?ipojit' a\nto by uÅ¾ mÄ?lo bÃ½t vÅ¡echno. Pokud narazÃte na problÃ©my, zkuste kliknout na tlaÄ?Ãtko 'Pomoc'\nv dialogu prÅ¯vodce 'NastavenÃ sÃtÄ? Tor'."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "ZobrazÃ tuto zprÃ¡vu."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PoÅ¾Ã¡dat o obyÄ?ejnÃ© mosty."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PoÅ¾Ã¡dat o IPv6 mosty."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PoÅ¾Ã¡dat o Pluggable Transport s TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "ZÃskat kopii veÅ?ejnÃ©ho GnuPG klÃÄ?e BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
index 403498e..0f2df21 100644
--- a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Christian Villum <villum@xxxxxxxxxxx>, 2014-2015
 # David Nielsen <gnomeuser@xxxxxxxxx>, 2014
 # Mogelbjerg <jan@xxxxxxxxxxxxx>, 2015
 # Lasse MÃ¸ller <hal9k@xxxxxxxxxx>, 2016
-# scootergrisen, 2017-2019
+# scootergrisen, 2017-2020
 # OliverMller <theoliver@xxxxxxxxxx>, 2011
 # Thomas Pryds <thomas@xxxxxxxx>, 2014
 # Tore BjÃ¸rnson <tore.bjornson@xxxxxxxxx>, 2013
@@ -16,145 +15,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-21 06:01+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
-msgstr "Beklager. Noget gik galt med din anmodning."
+msgstr "Beklager! Noget gik galt med din anmodning."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprog"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "RapportÃ©r en fejl"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ã?ndringslog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Marker alle"
+msgstr "MarkÃ©r alt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "Vis QRCode"
+msgstr "Vis QR-kode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QRCode for dine brolinjer"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ups, vi stÃ¥r i lort til halsen!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR-kode til dine brolinjer"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
+msgstr "Der lader til at vÃ¦re opstÃ¥et en fejl ved hentning af din QR-kode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-lÃ¦ser for at kopiere dine brolinjer over til mobile og andre enheder."
+msgstr "QR-koden indeholder dine brolinjer. Skan den med en QR-kodelÃ¦ser for at kopiere dine brolinjer til mobiltelefon og andre enheder."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr " Du kunne mÃ¥se prÃ¸ve %s at gÃ¥ tilbage %s og vÃ¦lge en anden brotype!"
+msgstr " Du kunne mÃ¥ske prÃ¸ve %s tilbage til %s og vÃ¦lge en anden brotype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Trin %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Trin %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "FÃ¥ %s broer %s"
+msgstr "Hent %s broer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Trin %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "%s TilfÃ¸j broer til Tor Browser %s"
+msgstr "%s TilfÃ¸j nu broerne til Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare giv mig broer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
-msgstr "Avancerede indstillinger"
+msgstr "Avancerede valgmuligheder"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -162,69 +176,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sent broer"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisk meddelelse; Svar venligst ikke.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dette er en automatiseret e-mail.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Her er dine broer:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har overskredet ratebegrÃ¦nsningen. SÃ¦nk venligst hastigheden! Den minimale tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i denne periode vil blive ignoreret."
+msgstr "Du har overskredet hastighedsgrÃ¦nsen. SÃ¦t venligst hastigheden ned! Den laveste tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i perioden vil blive ignoreret."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombiner COMMANDs for at angive flere valgmuligheder samtidigt)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkommen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPE'er som er understÃ¸ttet i Ã¸jeblikket:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hej min ven!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlige nÃ¸gler"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-mail til %s blev skabt ved hjÃ¦lp af regnbuer,\nenhjÃ¸rninger og glitter %s klokken %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Hvis broerne ikke er dem du har brug for, sÃ¥ besvar e-mailen med en af\nfÃ¸lgende kommandoer i meddelelseskroppen:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,158 +214,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB kan formidle broer med adskillige typer %sUdskiftelige transporter%s\nsom kan hjÃ¦lpe med at slÃ¸re dine forbindelser til Tor-netvÃ¦rket, og dermed\ngÃ¸re det vanskeligere for nogen som kan se din internet trafik at bestemme\nat du bruger Tor.\n\n"
+msgstr "BridgeDB kan formidle broer med adskillige %styper udskiftelige transporter%s\nsom kan hjÃ¦lpe med at slÃ¸re dine forbindelser til Tor-netvÃ¦rket, og dermed\ngÃ¸re det vanskeligere for nogen som kan se din internettrafik at bestemme\nat du bruger Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Nogle broer med IPv6-adresser er ogsÃ¥ tilgÃ¦ngelige, men ikke alle udskiftelige\ntransporter understÃ¸tter IPv6.\n\n"
+msgstr "Nogle broer med IPv6-adresser er ogsÃ¥ tilgÃ¦ngelige, dog er nogle udskiftelige\ntransporter ikke kompatible med IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\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"
+msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket mÃ¥ske ikke lyder sÃ¥ smart, men de kan\ni mange tilfÃ¦lde stadigvÃ¦k hjÃ¦lpe med at omgÃ¥ internetcensur.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Hvad er broer?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Broer %s er Tor-relÃ¦er som hjÃ¦lper dig med at omgÃ¥ censur."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr "Jeg har brug for en alternativ metode til at fÃ¥ broer pÃ¥!"
+msgstr "Jeg har brug for en alternativ metode til at hente broer pÃ¥!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "En anden mÃ¥de at finde broer er at sende en e-mail til %s. BemÃ¦rk venligst at du skal\nsende mailen fra en konto hos en af de fÃ¸lgende e-mailudbydere:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "En anden mÃ¥de til at hente broer pÃ¥ er at sende en e-mail til %s. Lad e-mailens emne\nvÃ¦re tomt og skriv \"get transport obfs4\" i e-mailens meddelelseskrop. BemÃ¦rk venligst\nat du skal sende e-mailen fra en konto hos en af de fÃ¸lgende e-mailudbydere:\n%s eller %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mine broer virker ikke! Jeg har brug for hjÃ¦lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis Tor ikke virker for dig kan du sende en e-mail til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v at inkluderer sÃ¥ meget information om din sag som muligt, der i blandt:\nEn liste af broer og udskiftelige transporter du har prÃ¸vet at bruge, din\nTor Browser-version, hvilke beskeder Tor gav, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Hvis din Tor Browser ikke kan oprette forbindelse, sÃ¥ se %s og vores %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
-msgstr "Her er dine bro linjer:"
+msgstr "Her er dine brolinjer:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr "Find broer!"
+msgstr "Hent broer!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mekanismer til brodistribution"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementerer fire mekanismer til at distribuere broer: \"HTTPS\", \"Moat\",\n\"E-mail\" og \"Reserveret\". Broer som ikke distribueres over BridgeDB bruger\npseudomekanismen \"Ingen\". FÃ¸lgende liste forklarer kort hvordan mekanismerne\nvirker og vores %sBridgeDB metrics%s visualiserer hvor populÃ¦re hver\nmekanisme er."
+
+#: bridgedb/strings.py:115
+#, 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 "Distributionsmekanismen \"HTTPS\" uddeler broer over webstedet. Hent broer ved at\ngÃ¥ til %sbridges.torproject.org%s og vÃ¦lge dine foretrukne valgmuligheder\nog lÃ¸s den efterfÃ¸lgende CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, 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 "Distributionsmekanismen \"Moat\" er en del af Tor Browser som giver brugerne\nmulighed for at anmode om broer i deres Tor Browser-indstillinger. Hent broer ved\nat gÃ¥ til din Tor Browsers %sTor-indstillinger%s og klik pÃ¥ \"Anmod om en ny bro\", lÃ¸s\nden efterfÃ¸lgende CAPTCHA og Tor Browser tilfÃ¸jer automatisk dine nye\nbroer."
+
+#: bridgedb/strings.py:125
+#, 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 "Brugerne kan anmode om broer fra \"Email\"-distributionsmekanismen ved at sende en\ne-mail til %sbridges@xxxxxxxxxxxxxx%s og skrive \"get transport obfs4\" i\ne-mailens krop."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserveret"
+
+#: bridgedb/strings.py:130
+#, 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 vedligeholder et mindre antal broer som ikke distribueres automatisk.\nVi reserverer i stedet broerne til manuel distribution og uddeler dem til\nikke-statslige organisationer og andre organisationer og enkeltpersoner som\nbehÃ¸ver broer. Broer som distribueres over mekanismen \"Reserveret\" ser mÃ¥ske\nikke brugere i lang tid. BemÃ¦rk at distributionsmekanismen \"Reverseret\" kaldes\n\"Unallocated\" i %sbridge pool assignment%s-filer."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+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 "Broer som anvender distributionsmekanismen \"Ingen\" distribueres ikke af BridgeDB.\nDet er brooperatÃ¸rens ansvar er at distribuere deres broer til brugerne.\nBemÃ¦rk at ved relÃ¦sÃ¸gning vil en frisk opsÃ¦tning af broers distributionsmekanisme\nsige \"Ingen\" i op til cirka en dag. VÃ¦r lidt tÃ¥lmodig og\nden vil blive Ã¦ndret til broens faktiske distributionsmekanisme.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "VÃ¦lg venligst valgmuligheder for brotypen:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
-msgstr "Har du brug for IPv6 adresser?"
+msgstr "Har du brug for IPv6-adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Har du brug for en %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
-msgstr "Din browser kan ikke vise billeder ordentligt."
+msgstr "Din browser viser ikke billederne ordentligt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Indtast tegnene fra billedet ovenfor..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "SÃ¥dan starter du med at bruge dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "For at tage broer ind i Tor Browser, gÃ¥ da fÃ¸rst til %s Tor Browser\ndownloadside %s og fÃ¸lg instruktionerne i hvordan Tor Browser \ndownloades og startes."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " FÃ¸rst skal du %sdownloade Tor Browser%s. Vores Tor Browser-brugermanual\n forklarer hvordan du kan tilfÃ¸je dine broer til Tor Browser. Hvis du\n bruger Windows, Linux eller OS X, sÃ¥ %sklik her%s for at lÃ¦rer mere.\n Hvis du bruger Android, sÃ¥ %sklik her%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "TilfÃ¸j broerne til din Tor Browser ved at Ã¥bne dine\nbrowserprÃ¦ferencer og klikke pÃ¥ \"Tor\" og sÃ¥ tilfÃ¸je dem til\nfeltet \"Formidl en bro\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokerer eller pÃ¥ anden vis censurerer din internetudbyder forbindelser\ntil Tor-netvÃ¦rket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Anmod om uslÃ¸rede Tor-broer.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "VÃ¦lg \"Ja\" og klik sÃ¥ pÃ¥ \"NÃ¦ste\". For at konfigurere dine nye broer, kopiÃ©r\nog indsÃ¦t brolinjerne i den nÃ¦ste input boks. Klik til sidst 'Forbind', og sÃ¥\ner du klar! Hvis du stÃ¸der pÃ¥ problemer, sÃ¥ prÃ¸v at klikke pÃ¥\n\"HjÃ¦lp\"-knappen i \"Tor-netvÃ¦rksindstillinger\"-guiden for at fÃ¥ yderligere hjÃ¦lp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Vis denne besked."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Anmod almindelige broer."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Anmod IPv6-broer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Anmod om udskiftelig transport efter TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Anmod om IPv6-broer.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nÃ¸gle."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Anmod om obfs4-slÃ¸rede broer.)"
diff --git a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
index e28fdef..4351dfb 100644
--- a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,20 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Christian Kaindl <crisscross.kaindl@xxxxxxxxxx>, 2015
 # trantor <clucko3@xxxxxxxxx>, 2014
+# Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2020
+# Emma Peel, 2019
 # Ettore Atalan <atalanttore@xxxxxxxxxxxxxx>, 2014
 # jschfr <hello@xxxxxxxxxxxxxxx>, 2015
 # unknwon_anonymous <jackjohnson0001@xxxxxxxxx>, 2014
+# John Dee <Dr_Dee@xxxxxx>, 2019
 # Junge Limba <jungelimba@xxxxxxxxx>, 2015
 # Konstantin BB, 2014
 # Locke <locke@xxxxxxxxxxxxxx>, 2011
+# Philipp Winter, 2019
 # qbi <kubieziel@xxxxxxxxxxxxxx>, 2015
 # Roland Illig <roland.illig@xxxxxx>, 2018
 # Sebastian <sebix+transifex@xxxxxxxx>, 2015
@@ -23,116 +27,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-06-11 23:31+0000\n"
-"Last-Translator: Roland Illig <roland.illig@xxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 09:40+0000\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprache"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Einen Fehler melden"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Quellcode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ã?nderungsprotokoll"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Alles auswÃ¤hlen"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode anzeigen"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode fÃ¼r Ihre BrÃ¼ckenverbindungen"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Oh, es ist etwas schief gegangen!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Dieser QR-Code beinhaltet Ihre BrÃ¼ckenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre BrÃ¼ckenverbindungen auf ihre mobile und andere GerÃ¤te zu kopieren."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ist auf einen Fehler gestoÃ?en."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Im Moment sind keine BrÃ¼cken verfÃ¼gbar â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MÃ¶glicherweise sollten Sie versuchen %s zurÃ¼ckzugehen %s und einen anderen BrÃ¼ckentyp auszuwÃ¤hlen!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Schritt %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s herunterladen"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Schritt %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s BrÃ¼cken %s erhalten"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Schritt %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
@@ -141,27 +160,27 @@ msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sir nur BrÃ¼cken geben!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Erweiterte Optionen"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nein"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "keine"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -169,69 +188,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%srÃ¼cken erhalten"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Das ist eine automatische Nachricht. Bitte antworten Sie nicht darauf.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dies ist eine automatisierte E-Mail.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Hier sind Ihre BrÃ¼cken-Server (Bridges):"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Sie haben den Grenzwert Ã¼berschritten. Bitte verlangsamen! Der kleinste Abstand zwischen \nden E-Mails betrÃ¤gt %s Stunden. Alle weiteren E-Mails, wÃ¤hrend dieser Zeit, werden ignoriert."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "BEFEHLE: (Kombinieren Sie BEFEHLE um mehrere MÃ¶glichkeiten gleichzeitig anzugeben)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Willkommen bei BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Aktuell unterstÃ¼tzte Transporttypen:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hallo, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo Freund!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ã?ffentliche SchlÃ¼ssel"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Diese E-Mail wurde fÃ¼r %s am %s um %s mit Regenbogen, EinhÃ¶rnern und Glitzer erstellt."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Wenn diese BrÃ¼cken nicht das sind, was du brauchst, dann antworte auf diese E-Mail mit einem\nder folgenden Befehle im TextkÃ¶rper:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -242,7 +229,7 @@ msgid ""
 msgstr "BridgeDB kann BrÃ¼cken-Server mit verschiedenen %stypen der Pluggable Transports%s\nbereitstellen. Diese kÃ¶nnen helfen, Ihre Verbindungen zum Tor Network zu verschleiern. Damit wird es fÃ¼r Dritte schwieriger\nfestzustellen, dass Sie\nTor benutzen.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -254,7 +241,7 @@ msgstr "Einige BrÃ¼cken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn ei
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -263,134 +250,169 @@ msgid ""
 "\n"
 msgstr "ZusÃ¤tzlich hat die BridgeDB viele herkÃ¶mmliche BrÃ¼cken-Server %s ohnePluggable Transports %s. Das klingt erst einmal nicht so besonders. Es hilft Ihnen dennoch, in vielen FÃ¤llen die Internetzensur zu umgehen.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Was sind BrÃ¼cken?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s BrÃ¼cken-Server %s sind Tor-Relais, die Ihnen dabei helfen, die Zensur zu umgehen."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ich brauche einen anderen Weg, um Adressen von BrÃ¼cken-Servern zu erhalten."
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sie kÃ¶nnen auch eine E-Mail an %s schicken, um Adressen von BrÃ¼cken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Eine weitere MÃ¶glichkeit, BrÃ¼cken zu erhalten, ist das Senden einer E-Mail an %s.\nLass den E-Mail Betreff leer und schreibe \"get transport obfs4\" in den\nTextkÃ¶rper des E-Mail. Bitte beachte, dass du die E-Mail mit einer Adresse\naus einer der folgenden E-Mail-Anbieter senden musst:\n%s oder %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Meine BrÃ¼cken-Server funktionieren nicht! Ich brauche Hilfe!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Versuchen Sie in Ihrer E-Mail mÃ¶glichst viele Informationen Ã¼ber Ihr Problem einzubeziehen, \neinschlieÃ?lich einer Liste der BrÃ¼cken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Falls Tor keine Verbindung herstellen kann, lesen Sie bitte %s und unsere%s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Hier sind Ihre BrÃ¼ckenadressen:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Erhalten Sie Adressen von BrÃ¼cken-Servern!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "BrÃ¼cken-Verteilungsmechanismen"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementiert vier Mechanismen, um BrÃ¼cken zu verteilen: \"HTTPS\", \"Moat\",\n\"E-Mail\", und \"Reserviert\".  BrÃ¼cken, die nicht Ã¼ber BridgeDB verteilt werden, verwenden\nden Pseudo-Mechanismus \"None\".  Die folgende Liste erklÃ¤rt kurz, wie diese\nMechanismen funktionieren und unsere  %sBridgeDB-Metriken%s veranschaulichen, wie beliebt jedes der\nMechanismen ist."
+
+#: bridgedb/strings.py:115
+#, 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 "Der \"HTTPS\"-Verteilungsmechanismus verteilt BrÃ¼cken Ã¼ber diese Website. Um BrÃ¼cken\nzu erhalten, gehe zu %sbridges.torproject.org%swÃ¤hle deine bevorzugten Optionen und\nlÃ¶se das anschlieÃ?ende CAPTCHA ."
+
+#: bridgedb/strings.py:119
+#, 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 "Der \"Moat\"-Verteilungsmechanismus ist Teil des Tor Browser, der es den Nutzern erlaubt\nBrÃ¼cken aus ihren Tor Browser-Einstellungen heraus anzufordern. Um BrÃ¼cken anzufordern, gehe zu\nden %sTor-Einstellungen%sdeines Tor Browser, klicke auf \"neue BrÃ¼cke anfordern\", lÃ¶se das \nnachfolgende CAPTCHA, und der Tor Browser fÃ¼gt automatisch deine neuen\nBrÃ¼cken hinzu."
+
+#: bridgedb/strings.py:125
+#, 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 "Benutzer kÃ¶nnen BrÃ¼cken aus dem \"E-Mail\"-Verteilungsmechanismus anfordern, indem sie ein\nE-Mail an %sbridges@xxxxxxxxxxxxxx%s senden und \"get transport obfs4\" in den\nE-Mail-Text schreiben ."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserviert"
+
+#: bridgedb/strings.py:130
+#, 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 unterhÃ¤lt eine kleine Anzahl von BrÃ¼cken, die nicht automatisch verteilt werden.\nStattdessen reservieren wir diese BrÃ¼cken fÃ¼r die manuelle Verteilung und\ngeben sie an NGOs und andere Organisationen und Einzelpersonen heraus, die\nBrÃ¼cken benÃ¶tigen. BrÃ¼cken, die Ã¼ber den \"Reserviert\"-Mechanismus verteilt sind, dÃ¼rfen\ndie Benutzer nicht lange sehen. Beachte, dass in %sBrÃ¼cken-Pool-Zuweisungsdateien%s der \"reservierte\" Verteilungsmechanismus \"Nicht zugewiesen\" genannt wird."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nichts"
+
+#: bridgedb/strings.py:138
+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 "BrÃ¼cken, deren Verteilungsmechanismus \"None\" ist, werden von BridgeDB nicht verteilt.\nEs liegt in der Verantwortung der betreibenden Person der BrÃ¼cke, seine BrÃ¼cken an Benutzer zu verteilen.\nBeachte, dass bei der Relay-Suche der Verteilungs-Mechanismus  einer frisch eingerichteten BrÃ¼cke\nfÃ¼r bis zu etwa einem Tag \"None\" sagt. Sei ein wenig geduldig, dann\nwird es zum eigentlichen Verteilungsmechanismus der BrÃ¼cke wechseln.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Bitte wÃ¤hlen Sie die Optionen fÃ¼r den BrÃ¼ckentyp aus:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "BenÃ¶tigen Sie IPv6-Adressen?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BenÃ¶tigen Sie eine %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "So starten Sie die Benutzung Ihrer BrÃ¼cken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Als Erstes musst du %sTor Browser herunterladen%s. Unser Tor Browser Benutzer-\nHandbuch erklÃ¤rt, wie du deine BrÃ¼cken zum Tor Browser hinzufÃ¼gen kannst. Wenn du \nWindows, Linux, or OS X verwendest, %sklick hier%s um mehr zu erfahren. Wenn du \nAndroid verwendest, %sklick hier%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "FÃ¼ge diese BrÃ¼cken zu deinem Tor Browser hinzu, indem du die Einstellungen deines Browsers Ã¶ffnest,\nauf \"Tor\" klickst und sie dann dem Feld \"Eine\nBrÃ¼cke zur VerfÃ¼gung stellen\" hinzufÃ¼gst."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(UneingeschrÃ¤nkte Tor-BrÃ¼cken anfordern.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "WÃ¤hlen Sie Â»JaÂ« und klicken dann auf Â»WeiterÂ«. Um Ihre neuen BrÃ¼cken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der BrÃ¼cken und fÃ¼gen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \nÂ»VerbindenÂ« und Sie kÃ¶nnen loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den Â»HilfeÂ«-Knopf im Assistenten der Â»Tor- NetzwerkeinstellungenÂ« zu klicken, \num weitere Hilfe zu erhalten."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Diese Nachricht anzeigen."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Standard-BrÃ¼cken anfordern."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6-BrÃ¼cken anfordern."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Einen Pluggable Transport des TYPEs anfordern."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6-BrÃ¼cken anfordern.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Eine Kopie des Ã¶ffentlichen GnuPG-SchlÃ¼ssels der BrÃ¼ckendatenbank erhalten."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(UneingeschrÃ¤nkte obfs4-BrÃ¼cken anfordern.)"
diff --git a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
index 91fc639..dba2992 100644
--- a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Adrian Pappas <pappasadrian@xxxxxxxxx>, 2014
@@ -8,13 +8,15 @@
 # andromeas <andromeas@xxxxxxxxxxx>, 2014
 # A Papac <ap909219@xxxxxxxxxxxxxx>, 2018
 # oahanx, 2014
+# Elektra M. <safiragon@xxxxxxxx>, 2020
 # Ilias Giannaros <iliasgnrs@xxxxxxxxx>, 2015
 # isv31 <36b043a6@xxxxxxxxxxxxxxx>, 2014
 # kotkotkot <kotakota@xxxxxxxxx>, 2013
 # kotkotkot <kotakota@xxxxxxxxx>, 2012
 # LOUKAS SKOUROLIAKOS, 2015
+# Nikolaos Kostakos <kosnickx@xxxxxxxxx>, 2019
 # Orion Belt <orionbelt2@xxxxxxxxx>, 2018
-# Panos <alwayslivid@xxxxxxxxxxxxxx>, 2018-2019
+# Panagiotis Vasilopoulos, 2018-2019
 # Sofia K., 2018
 # mitzie <accounts@xxxxxxxxxxxx>, 2013
 # Wasilis Mandratzis <inactive+Wasilis@xxxxxxxxxxxxx>, 2013
@@ -22,116 +24,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Î£Ï?Î³Î½Ï?Î¼Î·! Î?Î¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬ Î¼Îµ Ï?Î¿ Î±Î¯Ï?Î·Î¼Î¬ Ï?Î±Ï?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Î?Î»Ï?Ï?Ï?Î±"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Î?Ï?Î±Ï?Î®"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Î?Ï?Î¹Î»Î¿Î³Î® Ï?Î»Ï?Î½"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Î?Î¼Ï?Î¬Î½Î¹Ï?Î·  QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Î?Ï?Ï?Ï?, ÎºÎ¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Î?Ï?Ï? Ï?,Ï?Î¹ Ï?Î±Î¯Î½ÎµÏ?Î±Î¹, Ï?Ï?Î®Ï?Î¾Îµ ÎÎ½Î± Ï?Ï?Ï?Î²Î»Î·Î¼Î± ÎºÎ±Ï?Î¬ Ï?Î·Î½ Î±Î½Î¬ÎºÏ?Î·Ï?Î· Ï?Î¿Ï? QRCode Ï?Î±Ï?. "
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Î?Ï?Ï?Ï? Ï?Î¿ QRCode Ï?ÎµÏ?Î¹ÎÏ?ÎµÎ¹ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï?. Î?Î¹Î±Î²Î¬Ï?Ï?Îµ Ï?Î¿ Î¼Îµ ÎÎ½Î± QRCode scanner Î³Î¹Î± Î½Î± Î±Î½Ï?Î¹Î³Ï?Î¬Ï?ÎµÏ?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï? Ï?Îµ ÎºÎ¹Î½Î®Ï?Î· ÎºÎ±Î¹ Î¬Î»Î»Î· Ï?Ï?Ï?ÎºÎµÏ?Î®."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î´Î¹Î±Î¸ÎÏ?Î¹Î¼ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Î?Î¿ÎºÎ¹Î¼Î¬Ï?Ï?Îµ Î½Î± %s Ï?Î¬Ï?Îµ Ï?Î¯Ï?Ï? %s ÎºÎ±Î¹ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Î´Î¹Î±Ï?Î¿Ï?ÎµÏ?Î¹ÎºÏ? Ï?Ï?Ï?Î¿ Î³ÎÏ?Ï?Ï?Î±Ï?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Î?Î®Î¼Î± %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Î?Î®Î¼Î± %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Î?Ï?Î¿ÎºÏ?Î®Ï?Ï?Îµ Ï?Î¹Ï? %s Î³ÎÏ?Ï?Ï?ÎµÏ?%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Î?Î®Î¼Î± %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browser %s"
@@ -140,27 +157,27 @@ msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browse
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÎ?%sÏ?Î»Ï?Ï? Î´Ï?Ï?Îµ Î¼Î¿Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Î?Ï?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Î?Ï?Î¹"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ÎºÎ±Î½ÎÎ½Î±"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÎ?%sÎ±Î¹!"
@@ -168,69 +185,37 @@ msgstr "%sÎ?%sÎ±Î¹!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÎ?%sÎ®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Î?Ï?Ï?Ï? ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î±Ï?Ï?Î¿Î¼Î±Ï?Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿ Î¼Î®Î½Ï?Î¼Î±Â· Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Î¼Î·Î½ Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Î?ÎµÏ?ÎµÏ?Î¬Ï?Î±Ï?Îµ Ï?Î¿ Ï?Ï?Î¹Î¿. Î Î±Ï?Î±ÎºÎ±Î»Ï?, Ï?Î¹Î¿ Î±Ï?Î³Î¬! Î? ÎµÎ»Î¬Ï?Î¹Ï?Ï?Î¿Ï? Ï?Ï?Ï?Î½Î¿Ï? Î¼ÎµÏ?Î±Î¾Ï? Î´Î¹Î±Î´Î¿Ï?Î¹ÎºÏ?Î½ email\n ÎµÎ¯Î½Î±Î¹ %s Ï?Ï?ÎµÏ?. Î?Î»Î± Ï?Î± ÎµÎ½Î´Î¹Î¬Î¼ÎµÏ?Î± email Ï?Îµ Î±Ï?Ï?Ï? Ï?Î¿ Ï?Ï?Î¿Î½Î¹ÎºÏ? Î´Î¹Î¬Ï?Ï?Î·Î¼Î± Î¸Î± Î±Î³Î½Î¿Î¿Ï?Î½Ï?Î±Î¹."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Î?Î?Î¤Î?Î?Î?Î£: (Ï?Ï?Î½Î´Ï?Î¬Ï?Ï?Îµ Î?Î?Î¤Î?Î?Î?Î£ Î³Î¹Î± Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Ï?Î¿Î»Î»Î±Ï?Î»ÎÏ? Ï?Î±Ï?Î±Î¼ÎÏ?Ï?Î¿Ï?Ï? Ï?Î±Ï?Ï?Ï?Ï?Ï?Î¿Î½Î±)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Î?Î±Î»Ï?Ï? Î®Ï?Î¸Î±Ï?Îµ Ï?Ï?Î¿ BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Î¥Ï?Î¿Ï?Ï?Î·Ï?Î¹Î¶Ï?Î¼ÎµÎ½Î± transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Î?ÎµÎ¹Î¬ Ï?Î±Ï?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Î?ÎµÎ¹Î± Ï?Î¿Ï?, Ï?Î¯Î»Îµ!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Î?Î·Î¼Ï?Ï?Î¹Î± Î?Î»ÎµÎ¹Î´Î¹Î¬"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Î?Ï?Ï?Ï? Ï?Î¿ email Ï?Î±Ï?Î®Ï?Î¸Î· Î¼Îµ Î±Î³Î¬Ï?Î·, Î¿Ï?Ï?Î¬Î½Î¹Î± Ï?Ï?Î¾Î± ÎºÎ±Î¹ Ï?Ï?Ï?Ï?Ï?Ï?ÎºÎ¿Î½Î·\nÎ³Î¹Î± Ï?Î¿Î½/Ï?Î·Î½ %s, Ï?Î·Î½ %s Ï?Ï?Î¹Ï? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -241,7 +226,7 @@ msgid ""
 msgstr "Î? BridgeDB Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î±Ï?ÎÏ?ÎµÎ¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹Î¬Ï?Î¿Ï?Î¿Ï?Ï? %sÏ?Ï?Ï?Î¿Ï?Ï? Pluggable Transports%s,\nÏ?Î± Î¿Ï?Î¿Î¯Î± Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± ÎºÏ?Ï?Ï?Î¿Ï?Î½ Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Î±Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor, ÎºÎ¬Î½Î¿Î½Ï?Î±Ï? Ï?Î¿\nÎ´Ï?Ï?ÎºÎ¿Î»Ï?Ï?ÎµÏ?Î¿ Î³Î¹Î± ÎºÎ¬Ï?Î¿Î¹Î¿Î½ Ï?Î¿Ï? Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸ÎµÎ¯ Ï?Î· ÎºÎ¯Î½Î·Ï?Î· Ï?Î±Ï? Î½Î± ÎºÎ±Ï?Î±Î»Î¬Î²ÎµÎ¹ Ï?Ï?Ï?\nÏ?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -253,7 +238,7 @@ msgstr "Î¥Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? IPv6, Î±Î»Î»
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -262,134 +247,169 @@ msgid ""
 "\n"
 msgstr "Î?Ï?Î¯Ï?Î·Ï?, Î· BridgeDB ÎÏ?ÎµÎ¹ Ï?Î¿Î»Î»ÎÏ? Ï?Î±Î»Î¹ÎÏ? ÎºÎ±Î»ÎÏ? Î³ÎÏ?Ï?Ï?ÎµÏ? %s Ï?Ï?Ï?Î¯Ï?\nPluggable Transports %s Ï?Î¿Ï? Î¯Ï?Ï?Ï? Î´ÎµÎ½ Î±ÎºÎ¿Ï?Î³ÎµÏ?Î±Î¹ ÎºÎ±Ï?Î±Ï?Î»Î·ÎºÏ?Î¹ÎºÏ?, Î±Î»Î»Î¬ Ï?Îµ Ï?Î¿Î»Î»ÎÏ? Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÎ¹Ï? Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï? Î²Î¿Î·Î¸Î®Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï?Î±ÎºÎ¬Î¼Ï?ÎµÏ?Îµ Ï?Î· Î»Î¿Î³Î¿ÎºÏ?Î¹Ï?Î¯Î±.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Î¤Î¹ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ?;"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "Î?Î¹ %s Î?ÎÏ?Ï?Ï?ÎµÏ? %s ÎµÎ¯Î½Î±Î¹ Tor Î±Î½Î±Î¼ÎµÏ?Î±Î´Ï?Ï?ÎµÏ? Ï?Î¿Ï? Î²Î¿Î·Î¸Î¿Ï?Î½ Ï?Ï?Î·Î½ Ï?Î±Ï?Î¬ÎºÎ±Î¼Ï?Î· Ï?Î·Ï? Î»Î¿Î³Î¿ÎºÏ?Î¹Ï?Î¯Î±Ï?. "
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ ÎÎ½Î±Î½ ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÏ? Ï?Ï?Ï?Ï?Î¿ Î³Î¹Î± Î»Î®Ï?Î· Î³ÎµÏ?Ï?Ï?Ï?Î½! "
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬ Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î»Î¬Î²ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?ÎµÎ»Î½Î¿Î½Ï?Î±Ï? email Ï?Ï?Î¿ %s. Î Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?ÎµÎ¯Î»ÎµÏ?Îµ email Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? Î¼Î¯Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· email Î±Ï?Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î¬Ï?Î¿Ï?Î¿Ï?Ï?:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Î?Î½Î±Ï? Î¬Î»Î»Î¿Ï? Ï?Ï?Ï?Ï?Î¿Ï? Î³Î¹Î± Î½Î± Î»Î¬Î²ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? ÎµÎ¯Î½Î±Î¹ Î½Î± Ï?Ï?ÎµÎ¯Î»ÎµÏ?Îµ ÎÎ½Î± email Ï?Ï?Î¿ %s. Î?Ï?Î®Ï?Ï?Îµ Ï?Î¿ Î¸ÎÎ¼Î± Ï?Î¿Ï? email ÎºÎµÎ½Ï? ÎºÎ±Î¹ Î³Ï?Î¬Ï?Ï?Îµ \"get transport obfs4\" Ï?Ï?Î¿ Ï?Ï?Î¼Î± Ï?Î¿Ï? email. Î Î±Ï?Î±ÎºÎ±Î»Î¿Ï?Î¼Îµ Ï?Î·Î¼ÎµÎ¹Ï?Ï?Ï?Îµ Ï?Ï?Ï? Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?ÎµÎ¯Î»ÎµÏ?Îµ Ï?Î¿ email Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? Î¼Î¯Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· Î±Ï?Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î¬Ï?Î¿Ï?Î¿Ï?Ï? email: %s Î® %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Î?Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Î¿Ï? Î´ÎµÎ½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¿Ï?Î½! Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ Î²Î¿Î®Î¸ÎµÎ¹Î±! "
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Î?Î½ Ï?Î¿ Tor Ï?Î±Ï? Î´Îµ Î´Î¿Ï?Î»ÎµÏ?ÎµÎ¹, Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? Î´Ï?Ï?Ï?Îµ Î¼Î±Ï? Ï?Ï?Î¿ Ï?Î¿ Î´Ï?Î½Î±Ï?Ï?Î½ Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Ï?Î»Î·Ï?Î¿Ï?Î¿Ï?Î¯ÎµÏ? Î³Î¹Î± Ï?Î¿ \nÏ?Ï?Î¬Î»Î¼Î± Ï?Î¿Ï? Ï?Ï?Î½Î±Î½Ï?Î®Ï?Î±Ï?Îµ, Ï?Ï?Ï?Ï? Ï?Î· Î»Î¯Ï?Ï?Î± Î³ÎµÏ?Ï?Ï?Ï?Î½ ÎºÎ±Î¹ Ï?Î± Pluggable Transports \nÏ?Î¿Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?Î±Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ, Ï?Î·Î½ ÎÎºÎ´Î¿Ï?Î· Ï?Î¿Ï? Tor Browser, \nÏ?,Ï?Î¹ Î¼Î·Î½Ï?Î¼Î±Ï?Î± ÎÎ´ÎµÎ¹Î¾Îµ Ï?Î¿ Tor, ÎºÏ?Î»."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Î?Î¬Î½ Î¿ Tor Browser Ï?Î±Ï? Î´ÎµÎ½ Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯, Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Î¯Î¾Ï?Îµ Î¼Î¹Î± Î¼Î±Ï?Î¹Î¬ Ï?Ï?Î¿ %s ÎºÎ±Î¹ Ï?Ï?Î¿ Î´Î¹ÎºÏ? Î¼Î±Ï? %s. "
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³Ï?Î±Î¼Î¼ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Î?Î®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Î?Î±Î¼Î¯Î±"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¹Ï? ÎµÏ?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Î¿Î½ Ï?Ï?Ï?Î¿ Ï?Î·Ï? Î³ÎÏ?Ï?Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Î§Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ Î¼Î¹Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· IPv6;"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Î?Î®Ï?Ï?Ï? Ï?Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ ÎÎ½Î± %s;"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Î? browser Ï?Î±Ï? Î´ÎµÎ½ ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Ï?Î¹Ï? ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Ï?Î¬."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÏ?Î®Ï?ÎµÏ? Î±Ï?Ï? Ï?Î·Î½ Ï?Î±Ï?Î±Ï?Î¬Î½Ï? Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î¯Î±..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Î Ï?Ï? Î½Î± Î±Ï?Ï?Î¯Ï?ÎµÏ?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Î±Ï?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Î?Î¹Î± Î½Î± ÎµÎ¹Ï?Î¬Î³ÎµÏ?Îµ bridges Ï?Ï?Î¿ Tor Browser, Î±Ï?Ï?Î¹ÎºÎ¬ ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ %s Tor Browser Ï?ÎµÎ»Î¯Î´Î±\nÎºÎ±Ï?ÎµÎ²Î¬Ï?Î¼Î±Ï?Î¿Ï?%s ÎÏ?ÎµÎ¹Ï?Î± Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¹Ï? Î¿Î´Î·Î³Î¯ÎµÏ? Î³Î¹Î± ÎºÎ±Ï?ÎÎ²Î±Ï?Î¼Î± ÎºÎ±Î¹ ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? \nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Î?Ï?Î±Î½ Ï?Ï?Î¬Ï?ÎµÏ?Îµ Ï?Ï?Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿ \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\" , ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ \"Î¡Ï?Î¸Î¼Î¹Ï?Î·\" ÎºÎ±Î¹ Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¿Ï?Ï? Î´Î¹Î±Î»Ï?Î³Î¿Ï?Ï? Î¼ÎÏ?Ï?Î¹ Î½Î± Ï?Î±Ï? Ï?Ï?Ï?Î®Ï?ÎµÎ¹:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Î? Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?\nÏ?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ \"Î?Î±Î¹\" ÎºÎ±Î¹ Î¼ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î?Ï?Ï?Î¼ÎµÎ½Î¿\". Î?Î¹Î± Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î± Î½ÎÎ± Ï?Î±Ï? \nbridges, Î±Î½Ï?Î¹Î³Ï?Î¬Ï?Ï?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î¼Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Ï?Î½ bridges Ï?Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ \nÎºÎµÎ¹Î¼ÎÎ½Î¿Ï?. Î?ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î£Ï?Î½Î´ÎµÏ?Î·\" ÎºÎ±Î¹ Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ¯Ï?Ï?Îµ ÎµÎ½Ï?Î¬Î¾ÎµÎ¹! Î?Î½ \nÎ±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Ï?ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î±, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ \"Î?Î¿Î®Î¸ÎµÎ¹Î±\" Ï?Ï?Î¹Ï? \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? \nÎ´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\"."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Î?Î¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Î±Ï?Ï?Ï? Ï?Î¿ Î¼Î®Î½Ï?Î¼Î±."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Î?Î¯Ï?Î·Ï?Î· Ï?Î±Î»Î¹Ï?Î½ ÎºÎ±Î»Ï?Î½ bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Î?Î¯Ï?Î·Ï?Î· IPv6 Î³ÎµÏ?Ï?Ï?Ï?Î½."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Î?Î·Ï?Î®Ï?Ï?Îµ ÎÎ½Î± Pluggable Transport Î²Î¬Ï?ÎµÎ¹ TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Î?Î¬Î²ÎµÏ?Îµ ÎÎ½Î± Î±Î½Ï?Î¯Î³Ï?Î±Ï?Î¿ Ï?Î¿Ï? Î´Î·Î¼Î¿Ï?Î¯Î¿Ï? GnuPG ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï? Ï?Î¿Ï? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
index 8bb8bff..c42e494 100644
--- a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,140 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015
+# Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015,2019-2020
 # Richard Shaylor <rshaylor@xxxxxx>, 2014
 # ronnietse <tseronnie@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 23:30+0000\n"
-"Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Source Code"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Select All"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Show QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode for your bridge lines"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "It seems there was an error getting your QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "There are no bridges available currently..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Step %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Step %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Get %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Step %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Now %s add the bridges to Tor Browser %s"
@@ -128,27 +143,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -156,69 +171,37 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[This is an automated message; please do not reply.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[This is an automated email.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Here are your bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Welcome to BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Currently supported transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hello, friend!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Public Keys"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "If these bridges are not what you need, reply to this email with one of\nthe following commands in the message body:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
 msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "I need an alternative way of getting bridges!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Leave the email subject\nempty and write \"get transport obfs4\" in the email's message body. Please note\nthat you must send the email using an address from one of the following email\nproviders: %s or %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "If your Tor doesn't work, you should email %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "If your Tor Browser cannot connect, please take a look at the %s and our %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Bridge distribution mechanisms"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 visualise how popular each of the\nmechanisms is."
+
+#: bridgedb/strings.py:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "Reserved"
+
+#: bridgedb/strings.py:130
+#, 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 organisations 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:137
+msgid "None"
+msgstr "None"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n Manual explains how you can add your bridges to Tor Browser. If you are\n using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n are using Android, %sclick here%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Add these bridges to your Tor Browser by opening your browser\npreferences, clicking on \"Tor\", and then adding them to the \"Provide a\nbridge\" field."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Request unobfuscated Tor bridges.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Displays this message."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Request vanilla bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Request IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Request a Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Request IPv6 bridges.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Get a copy of BridgeDB's public GnuPG key."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Request obfs4 obfuscated bridges.)"
diff --git a/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
index 9a919ec..5f07adc 100644
--- a/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
@@ -1,128 +1,142 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # identity, 2012
 # Mara Monstro <errydayanarchy@xxxxxxxxxx>, 2018
 # Rico Chan <rico@xxxxxxxxxxx>, 2014
 # trio <trio@xxxxxxxxxxxxx>, 2011
-# Tyquan Bush, 2019
+# 6c9ad24fb5ff3a00859fb84514d79173, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-07-11 23:22+0000\n"
-"Last-Translator: Tyquan Bush\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Pardonu! Io ne funkcias pri via peto."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingvo"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "raporti cimo"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "fontkodo"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Å?anÄ?oprotokolo"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "kontakto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "elekti Ä?ion"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Montri QR-kodon"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Kodo por viaj ponto linioj"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "ho ve, ho ve!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Å?ajnas, ke estis eraro ricevante vian QR-kodon."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ä?i tiu QR-kodo enhavas viajn ponto liniojn. Skanu Ä?in per QR-leganto por kopii viajn ponto liniojn sur poÅ?telefonojn kaj aliajn aparatojn."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Nuntempe ne ekzistas retpontojn."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Vi eble davas provi %s reiri %s kaj selekti alian retpontospeco."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "paÅ?o %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "elÅ?uti %s Tor-retumilo %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "paÅ?o %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ekhavi %s retpotojn %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "paÅ?o %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
@@ -131,27 +145,27 @@ msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%suj donu retpontojn al mi!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "detalaj opcioj"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "neniom/neniu"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%ses!"
@@ -159,69 +173,37 @@ msgstr "%sJ%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sE%skhavi Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ä?i tiu estas aÅtomate kreita mesaÄ?o; bonvole ne respondu.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Jen viaj retpontoj."
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Vi superis la limiton. Bonvolu malakceli! La minimala tempo inter retleteroj estas\n%s horoj. Pliaj retiloj dum tiu tempo estos ignorata."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ORDONOJ: (kombinu ORDONOJN por samtempe specifiki diversaj opciojn)."
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Estu bonvena al BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Nuntempe subtenata transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Saluton, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Saluton, amiko!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "publikaj Å?losiloj"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ä?i tiu retletero estas generita kun Ä?ielarkoj, unikornoj kaj steloj\npor %s je %s, %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +214,7 @@ msgid ""
 msgstr "BridgeDB povas provizi pontojn/bridges kun diversaj %stypes de Pluggable Transports%s,\nkiuj povas helpi sekretigi viajn konektojn al la Tor Network kaj malfaciligi provojn kiuj estas destinitaj\nobservi vian datumtrafikon kaj vian uzantecon de Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -244,7 +226,7 @@ msgstr "AnkaÅ kelkaj retpontoj kun IPv6-adresoj estas disponeblaj, sed iuj Plug
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +235,169 @@ msgid ""
 "\n"
 msgstr "Krome BridgeDB havas abundon da regulaj retpontoj %s sen iuj\nPluggable Transports %s, kiuj eble ne estas mojosa, tamen ofte povas helpi eviti\nreta cenzuro.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Kio estas retpontoj?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s retpontoj %s estas interretaj babiloj kiuj helpas vin eviti cenzuro."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Mi bezonas alternativon ekhavi retpontojn!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sendu retletero al %s por ekhavi retpontojn alternative. Bonvolu konstati ke vi\nbezonas sendi retleteron per adreso de la sekvonta retpoÅ?ta provizanto:\n%s, %s aÅ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor ne funkcias, kontaktigu %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Provu klarigi vian kazon tre detale kaj aldonu liston da retpontoj kaj Pluggable Transports\nkiujn vi provis uzi. Krome aldonu vian Tor Browser-version kaj Ä?iujn mesaÄ?ojn, kiujn Tor\neligis."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Jen viaj retpontoj:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ekhavu retpontojn!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Neniom"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Bonvolu selekti opciojn pri retpontospeco."
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ä?u vi bezonas IPv6-adresojn?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ä?u vi bezonas %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Via retumilo vidigas bildojn ne dece."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Enigu la literoj en la bildo Ä?i-supre."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Kiel komenci uzi viajn retpontojn."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ä?u via provizanto de retservoj (angle: ISP) blokas aÅ alimaniere cenzuras konektojn al la Tor-reto?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selektu 'Jes' kaj alklaku 'sekva'. Por konfiguri viajn novajn retpontojn, kopiu kaj alglui\nla retpontolineojn al la dialogujo. Finfine alklaku 'konektiÄ?i'.\nSe vi havas problemojn, provi alklaki la 'helpo'-butonon en la Tor-retagordasistanto\npor pli da asistado."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Vidigi Ä?i tiun mesaÄ?on."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Peti IPv6-retpontojn."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Peti permutebla transporto de TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ekhavi kopio de publika GnuPG-Å?losilo de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
index d0883fb..4941e14 100644
--- a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # dark_yoshi <angelargi@xxxxxxxx>, 2014
@@ -9,7 +9,7 @@
 # BL <tresemes3@xxxxxxxxx>, 2014
 # Edward Navarro, 2015
 # Emma Peel, 2017-2019
-# eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2016
+# eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2016,2019-2020
 # Ignacio RodrÃguez <inactive+i5o@xxxxxxxxxxxxx>, 2015
 # NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011
 # Noel Torres <envite@xxxxxxxxxxxxx>, 2013
@@ -24,116 +24,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-03-10 11:12+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 17:09+0000\n"
+"Last-Translator: eulalio barbero espinosa <eulaliob@xxxxxxxxx>\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Informar sobre un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Registro de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todos"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar cÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para tus lÃneas de puentes"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Oh oh, Â¡la liamos!  "
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que hubo un error al obtener tu cÃ³digo QR. "
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©alo con un lector de cÃ³digos QR para copiar tus lÃneas de puente a dispositivos mÃ³viles y otros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ha encontrado un error"
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ahora mismo no hay ningÃºn puente disponible..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Â¡Tal vez deberÃas probar a %s retroceder %s y seleccionar un tipo distinto de puente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s "
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descarga %s el Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Consigue %s puentes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
@@ -142,27 +157,27 @@ msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡Dame %sS%sÃ³lo puentes! "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -170,69 +185,37 @@ msgstr "Â¡%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sC%sonseguir Puentes"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automÃ¡tico; por favor no respondas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este es un correo automÃ¡tico.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "AquÃ tienes tus puentes:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Has excedido el lÃmite de cuota. Por favor, Â¡mÃ¡s despacio! El tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Durante este periodo se ignorarÃ¡n los correos. "
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs para especificar de manera simultÃ¡nea opciones mÃºltiples)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Â¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Â¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Â¡Hola amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves pÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo fue generado con arcoiris, unicornios y estrellitas para %s el %s a las %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si estos no son los puentes que necesitas, responde a este correo con una\nde las siguientes Ã³rdenes en el cuerpo del mensaje."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -243,7 +226,7 @@ msgid ""
 msgstr "BridgeDB puede proporcionar puentes con diferentes %stipos de Pluggable Transports%s que pueden ayudar a ofuscar tus conexiones a la red Tor, dificultando determinar que estÃ¡s usando Tor para alguien que estÃ© observando tu trÃ¡fico de Internet.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -255,7 +238,7 @@ msgstr "TambiÃ©n hay disponibles varios puentes con direcciones IPv6, aunque alg
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -264,134 +247,169 @@ msgid ""
 "\n"
 msgstr "AdemÃ¡s, BridgeDB tiene un montÃ³n de puentes estÃ¡ndar %s sin ningÃºn Pluggable Transport %s , lo que tal vez no suena tan molÃ³n, pero que todavÃa pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Â¿QuÃ© son los puentes?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Â¡Necesito un modo alternativo de obtenciÃ³n de puentes de red!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Otra forma de conseguir puentes es enviando un correo electrÃ³nico a%s. Deja el asunto del \ncorreo vacÃo y escribe \"get transport obfs4\"en el cuerpo del mensaje del correo. Ten en cuenta\nde que tienes que enviar el correo usando la direcciÃ³n de uno de los siguientes proveedores\nde correo: %s o %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
-msgstr "Â¡Mis puentes funcionan! Â¡Necesito ayuda!"
+msgstr "Â¡Mis puentes no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, debes enviar un correo a %s"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta incluir tanta informaciÃ³n como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versiÃ³n de Tor Browser y cualquier mensaje que Tor haya dado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si tu Tor Browser no puede conectar, lee el %s y nuestro %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Estas son tus lÃneas de puente de red:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Â¡Obtener puentes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuciÃ³n del puente"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementa cuatro mecanismos para distribuir los puentes: \"HTTPS\", \"Moat\",\n\"Email\" y \"Reserved\". Los puentes que no se distribuyen por BridgeDB utilizan el \nseudo-mecanismo \"None\". La siguiente lista explica brevemente cÃ³mo funcionan estos\nmecanismos y nuestras%smedidas de BridgeDB%s quÃ© popular es cada uno\nde los mecanismos."
+
+#: bridgedb/strings.py:115
+#, 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 "El mecanismo de distribuciÃ³n \"HTTPS\" distribuye puentes en este sitio web. Para\nobtener puentes, ve a %sbridges.torproject.org%s, selecciona tus opciones\npreferidas, y resuelve el CAPTCHA de rigor."
+
+#: bridgedb/strings.py:119
+#, 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 "El mecanismo de distribuciÃ³n \"Moat\" es parte del Navegador Tor, permitiendo a los\nusuarios solicitar puentes desde dentro de sus configuraciones de Tor. Para obtener\npuentes, ve a %sTor settings%s, click on \"request a new bridge\", de tu Navegador\nTor, pulsa en \"solicitar un nuevo puente\", resuelve el CAPTCHA, y el navegador Tor\naÃ±adirÃ¡ automÃ¡ticamente tus nuevos puentes."
+
+#: bridgedb/strings.py:125
+#, 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 "Los usuarios pueden solicitar puentes del mecanismo de distribuciÃ³n del \"Correo\nElectrÃ³nico\" enviando un correo electrÃ³nico a %sbridges@xxxxxxxxxxxxxx%s y\nescribiendo \"get transport obfs4\" en el cuerpo del correo electrÃ³nico."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, 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 mantiene un pequeÃ±o nÃºmero de puentes que no se distribuyen\nautomÃ¡ticamente. En su lugar, reservamos estos puentes para su distribuciÃ³n\nmanual y los repartimos a ONG y otras organizaciones y personas que necesitan\npuentes. Los puentes que se distribuyen mediante el mecanismo \"Reservado\"\npueden no ver usuarios durante mucho tiempo. NÃ³tese que el mecanismo de\ndistribuciÃ³n \"Reservado\" se llama \"No asignado\" en los %sarchivos de\nasignaciÃ³n de puentes%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:138
+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 "Los puentes cuyo mecanismo de distribuciÃ³n es \"Ninguno\" no son distribuidos\npor BridgeDB. Es responsabilidad del operador del puente distribuir sus puentes\na los usuarios. NÃ³tese que en la BÃºsqueda de Relay, el mecanismo de distribuciÃ³n\nde un puente reciÃ©n instalado dice \"Ninguno\" durante aproximadamente un dÃa. Ten\nun poco de paciencia, y luego se cambiarÃ¡ al mecanismo de distribuciÃ³n real del\npuente.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecciona opciones para el tipo de puente:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no estÃ¡ mostrando las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Introduce los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar los puentes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para introducir 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Primero, necesitas %sbajarte el Navegador Tor%s. Nuestro Manual de Usuario\ndel Navegador Tor explica como puedes aÃ±adir tus puentes al navegador. Si estÃ¡s\nusando Windows, Linux, u OS X, %sclick aquÃ%s para saber mÃ¡s. Si estÃ¡s\nusando Android, %sclick aquÃ%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "AÃ±ade estos puentes a tu navegador Tor abriendo las preferencias\nde tu navegador, clic en \"Tor\" y a continuaciÃ³n aÃ±Ã¡delos al campo\n\"Proporcionar un puente\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Â¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicita puentes Tor no ofuscados.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecciona 'SÃ' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las lÃneas de puentes en el recuadro de texto.\nPor Ãºltimo, haz clic en 'Conectar', Â¡y listo! Si hay algÃºn problema, prueba en 'Ayuda' en el asistente de 'ConfiguraciÃ³n de red Tor' para asistencia adicional."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Muestra este mensaje."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicitar puentes estÃ¡ndar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar puente de red IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Pluggable Transport por TYPE ."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicita puentes IPv6)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicita puentes ofuscados obfs4.)"
diff --git a/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
index 15e14db..5b7a1de 100644
--- a/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
@@ -1,130 +1,148 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # cametiope <aldohcasa@xxxxxxxxxxx>, 2014
 # Alfredo Chaves <achaves.blg@xxxxxxxxx>, 2015
 # angelica14 <angmarmt13@xxxxxxxxx>, 2014
+# Burro Moro <burromoro@xxxxxxxxxx>, 2020
 # Daniel Gray, 2015
 # JosÃ© FabiÃ¡n, 2014
+# kaze kaze <kaze@xxxxxxx>, 2019
 # ezemelano <melanoeze@xxxxxxxxx>, 2014
+# Pablito Labarta <pablitolabarta@xxxxxxxxx>, 2019
 # Pablo Di Noto <pdinoto@xxxxxxxxx>, 2016
 # Zuhualime Akoochimoya, 2018-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-07 15:16+0000\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 22:05+0000\n"
+"Last-Translator: Burro Moro <burromoro@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con tu solicitud."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "BitÃ¡cora de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para tus lÃneas de bridge"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Â¡Oh, sonamos!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene tus lÃneas de bridge. Escanealo con un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB encontrÃ³ un error."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "En este momento no existen bridges disponibles..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de bridge!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar el %s Navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregÃ¡ los puentes al Navegador Tor %s"
@@ -133,27 +151,27 @@ msgstr "Ahora %s agregÃ¡ los puentes al Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡%sS%solamente dÃ¡me bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -161,69 +179,37 @@ msgstr "Â¡%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtener bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automÃ¡tico; por favor, no responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este es un correo automatizado]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "AquÃ estÃ¡n tus bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Te has excedido el lÃmite de tasa. Â¡Por favor, andÃ¡ mÃ¡s despacio! El tiempo mÃnimo entre\ncorreos electrÃ³nicos es %s horas. Todos los correos electrÃ³nicos siguientes en este lapso de tiempo serÃ¡n ignorados."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combinÃ¡ COMMANDs para especificar opciones mÃºltiples simultÃ¡neamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Â¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport actualmente soportados:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Â¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Â¡Hola amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves pÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo electrÃ³nico fue generado con arcoiris, unicornios y destellos\npara %s el %s a las %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si estos bridges no son lo que necesitas, responda a este correo electrÃ³nico con uno de\nlos siguientes comandos en el cuerpo del mensaje:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +220,7 @@ msgid ""
 msgstr "BridgeDB puede proveerte bridges con varios %stipos de Pluggable Transports%s,\nque pueden ayudar a ofuscar tus conexiones a Tor Network, haciendo mÃ¡s difÃcil\nque alguien que observe tu trÃ¡fico de internet determine que estÃ¡s\nusando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -246,7 +232,7 @@ msgstr "Algunos bridges con direcciones IPv6 tambiÃ©n estÃ¡n disponibles, aÃºn c
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +241,169 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de cuete, %s sin ningÃºn\nPluggable Transports %s, que tal vez no suenen tan genial, pero aÃºn pueden\nayudar a burlar la censura de internet en muchos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Â¿QuÃ© son los bridges?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Los Bridges %s son relevos de Tor que te ayudan a evitar la censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Â¡Necesito una manera alternativa de obtener bridges!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otra manera de obtener bridges es enviando un correo electrÃ³nico a %s.  Por favor notÃ¡ que debÃ©s enviar el correo electrÃ³nico usando una direcciÃ³n de uno de los siguientes proveedores:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Otra forma de obtener bridges es enviar un correo electrÃ³nico a %s. Deja el asunto del correo electrÃ³nico\nvacÃo y escribe \"get transport obfs4\" en el cuerpo del mensaje del correo electrÃ³nico. Ten en cuenta\nque debes enviar el correo electrÃ³nico utilizando una direcciÃ³n de uno de los siguientes correos electrÃ³nicos de los \nproveedores: %s or %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis bridges no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, deberÃas enviar un correo electrÃ³nico a %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "IntentÃ¡ incluir toda la informaciÃ³n posible sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, la versiÃ³n de tu Navegador Tor,\ny cualquier mensaje que Tor haya presentado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si Tor no puede conectarse, consultÃ¡ el %s y nuestro %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "AquÃ estÃ¡n tus lÃneas de bridges:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Â¡ObtenÃ© Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuciÃ³n de  Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementa cuatro mecanismos para distribuir bridges: \"HTTPS\", \"Moat\",\n\"Email\", y \"Reserved\". Los bridges que no se distribuyen a travÃ©s de BridgeDB utilizan\nel pseudo-mecanismo \"None\".  La siguiente lista explica brevemente cÃ³mo \nestos mecanismos y nuestras %smÃ©tricas de BridgeDB%s visualizan que tan popular\nes el mecanismo."
+
+#: bridgedb/strings.py:115
+#, 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 "El mecanismo de distribuciÃ³n \"HTTPS\" reparte bridges sobre este sitio web. Para obtener\nbridges, dirÃgete a %s bridges.torproject.org%s, selecciona tus opciones preferidas y\nresuelva el CAPTCHA subsiguiente."
+
+#: bridgedb/strings.py:119
+#, 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 "El mecanismo de distribuciÃ³n \"Moat\" es parte del navegador Tor, lo que permite a los usuarios\nsolicitar bridges desde la configuraciÃ³n de su navegador Tor. Para obtener bridges, dirÃgete a\ntu Navegador Tor %sen configuraciones de Tor%s, haz clic en \"solicitar un nuevo bridge\", resuelve el\nCAPTCHA subsiguiente y el Navegador Tor agregarÃ¡ automÃ¡ticamente tus nuevos\npuentes."
+
+#: bridgedb/strings.py:125
+#, 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 "Los usuarios pueden solicitar bridges desde el mecanismo de distribuciÃ³n \"Email\" enviando un\ncorreo electrÃ³nico a %sbridges@xxxxxxxxxxxxxx%s y escribiendo \"get transport obfs4\" en el \ncuerpo del correo electrÃ³nico."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, 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 mantiene una pequeÃ±a cantidad de bridges que no se distribuyen\nautomÃ¡ticamente. En cambio, reservamos estos bridges para su distribuciÃ³n manual y\nlos entregamos a las ONGÂ´s y otras organizaciones e individuos que necesitan\nbridges. Los bridges que se distribuyen a travÃ©s del mecanismo \"Reserved\" pueden no\nver a los usuarios durante mucho tiempo. Ten en cuenta que el mecanismo de distribuciÃ³n \"Reserved\" se\ndenomina \"Unallocated\" en los archivos de %sasignaciÃ³n de agrupaciÃ³n de bridges.%s "
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ninguno"
+
+#: bridgedb/strings.py:138
+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 no distribuye los bridges cuyo mecanismo de distribuciÃ³n es\"None\"\nEs responsabilidad del operador del bridge distribuir sus bridges a los\nusuarios. Ten en cuenta que en el Relay Search, el mecanismo de distribuciÃ³n de un bridge reciÃ©n configurado\ndice \"None\" por hasta aproximadamente un dÃa. Se un poco paciente, y\nluego cambiarÃ¡ al mecanismo de distribuciÃ³n real del bridge.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccionÃ¡ opciones para tipo de bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿NecesitÃ¡s direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿NecesitÃ¡s una %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "IngresÃ¡ los caracteres de la imagen..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar tus bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para introducir 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Primero, necesitas %sdescargar el Navegador Tor%s. Nuestro Manual de usuario del Navegador Tor\nexplica cÃ³mo puedes agregar tus puentes al Navegador Tor. Si estÃ¡s\nutilizando Windows, Linux u OS X, %shaz clic aquÃ%s para obtener mÃ¡s informaciÃ³n. Si estÃ¡s\nutilizando Android, %shaz clic aquÃ%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Agrega estos bridges a tu Navegador Tor abriendo las preferencias de tu navegador,\nhaciendo clic en \"Tor\" y luego agregÃ¡ndolos al campo \"Provide a\nbridge\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Â¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algÃºn modo censura conexiones\na la red de Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar Tor bridges no ofuscados.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "SeleccionÃ¡ 'SÃ' y luego cliqueÃ¡ 'Siguiente'.  Para configurar tus nuevos bridges, copiÃ¡ y\npegÃ¡ las lÃneas de bridges en el cuadro de texto.  Finalmente, cliqueÃ¡ 'Conectar' y,\nÂ¡eso deberÃa de ser todo! Si experimentÃ¡s algÃºn problema, intentÃ¡ cliquear el botÃ³n 'Ayuda'\ndel asistente de 'ConfiguraciÃ³n de la Red de Tor' para recibir mÃ¡s asistencia."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostrar Ã©ste mensaje."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Pedir bridges ordinarios."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pedir bridges IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pedir un Pluggable Transport por TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicitar bridges IPv6 .)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicita bridges obfs4 ofuscados)."
diff --git a/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
index 233445c..1e7e95f 100644
--- a/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Bernard Rodriguez <hey.bernard@xxxxxxxxx>, 2016
@@ -14,116 +14,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-20 00:56+0000\n"
-"Last-Translator: b39e6b72373066b02663de71fc788486\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "PerdÃ³n! Algo saliÃ³ mal con tu peticiÃ³n."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lenguaje"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Registro de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar cÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR  para las entradas de tu(s) repetidores/puente(s)(bridge lines)"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Â¡Oh, diantres!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que hubo un error al obtener tu cÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene entradas de tus repetidores/puentes. LÃ©elo con un lector de cÃ³digos QR para copiar las entradas de tus repetidores/puentes en tu telÃ©fono mÃ³vil u otros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Actualmente no hay ningÃºn repetidor/puente disponible..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Tal vez deberÃa intentar %s ir hacÃa atrÃ¡s %s y seleccionar un tipo de repetidor/puente diferente."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s repetidores/puentes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
@@ -132,27 +147,27 @@ msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡SÃ³lo(%sJ%s) dame los repetidores/puentes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡SÃ(%sY%s)!"
@@ -160,69 +175,37 @@ msgstr "Â¡SÃ(%sY%s)!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "Obtener(%sG%s) repetidores/puentes"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "{Este es un mensage automÃ¡tico; por favor no lo conteste.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "AquÃ estÃ¡n tus puentes:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Has excedido el limite de envÃo. Â¡Por favor pausa! El tiempo minimo entre\ncorreos electrÃ³nicos es %s horas. Todos los demÃ¡s correos electrÃ³nicos durante este perÃodo serÃ¡n ignorados."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ORDENEs:(combina COMMANDs para especificar opciones multiples)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Â¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Â¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Â¡Hola, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves PÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo electrÃ³nico fue creado con arcoiris, unicornios y chispas\npara %s en %s en %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +216,7 @@ msgid ""
 msgstr "BridgeDB puede proveer repetidores/puentes con un gran %stipos de transportes conectables(Pluggable Transports)%s,\nlos cuales pueden ofuscar tus conexiones hacÃa la red de Tor, haciendo mÃ¡s\ndifÃcil para cualquiera que observe tu trÃ¡fico hacÃa Internet que estas\nusando Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -245,7 +228,7 @@ msgstr "Algunos puentes con direcciones IPv6 tambien estan disponibles, a traves
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +237,169 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB tiene muchos puentes de simple vainilla %s sin tener ningun transporte conectable %s lo cual podria no sonar tan genial, pero aun asi pueden ayudar con la censura de internet en muchos casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Â¿Que son puentes?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Puentes %s son los relÃ©s que te ayudan a evitar las censuras"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Â¡Necessito una forma alternativo de conectar con puentes!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otro modo de consigir puentes es mandar un correo electronico a %s. Tenga en cuenta que debe enviar el correco electronico con direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico: %s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis puentes no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si tu Tor no funciona, usted debe enviar por correo electrÃ³nico %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta poner tanta informacion como puedas sobre tu problema, incluyendo una lista de los puentes y Pluggable Transports que hayas intentado usar, tu version de Tor Browser, y cualquier mensaje que Tor haya mostrado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Aqui estan tus puentes:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Â¡Obten puentes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor selecciona las opciones para tu tipo de puente:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imagenes correctamente"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ponga los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Como empezar a usar tus puentes."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Â¿Tu proveedor de servicios de internet (ISP) bloquea o censura las conecciones\na la red Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccione \"Si\" luego presione \"Siguiente\".\nPara configurar sus nuevos puentes, copie y pegue\nlas lineas de los puentes en la caja de texto. Finalmente, presione \"Conectar\" y Â¡deberias de estar listo para continuar! Si tienes problemas, prueba presionar en  el botÃ³n de \"Ayuda\" en las \"configuraciones de red de Tor\" para mas asistencia."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Muestra este mensaje"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicita un puente por defecto"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicita puentes IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicita un transporte enchufable por TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obten una copia de la llave GnuPG deBridgeDBÂ´s "
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
index f984cde..94a0bc1 100644
--- a/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
@@ -1,126 +1,142 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Emma Peel, 2019
 # G <purexxxx@xxxxxxxxxxx>, 2015
+# Madis Otenurm, 2020
 # Mart Laub <mart@xxxxxxx>, 2014
 # Paul Martin Korp <paul.m.korp@xxxxxxxxx>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-30 10:46+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Vabandust! Midagi lÃ¤ks Teie pÃ¤ringuga valesti."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Teatage viga"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "LÃ¤htekood"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Muudatuste logi"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vali kÃµik"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "NÃ¤ita QR-koodi"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRKood teie silla ridade jaoks"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Oli seda nÃ¼Ã¼d vaja..."
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR-koodi hankimisel ilmnes viga."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et kopeerida silla read telefoni vÃµi teistesse seadmetesse."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ã?htegi silda ei ole hetkel saadaval..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "VÃµib-olla peaksid proovima %s tagasi minna %s ja valima teise silla tÃ¼Ã¼bi!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s samm."
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Lae alla %s Tor brauser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s samm."
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hangi %s sillad %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s samm."
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¼Ã¼d %s lisa sillad Tor\\'i brauserisse%s"
@@ -129,27 +145,27 @@ msgstr "NÃ¼Ã¼d %s lisa sillad Tor\\'i brauserisse%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sihtsalt anna mulle sillad!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "TÃ¤psemad seaded"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "mitte Ã¼kski"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sah!"
@@ -157,69 +173,37 @@ msgstr "%sJ%sah!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sangi sillad"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[See on automatiseeritud teada - palun Ã¤rge sellele vastake.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Siin on sinu sillad:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Olete Ã¼letanud mÃ¤Ã¤ra limiidi. Palun vÃµtke aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KÃ?SUD: (kombineeri KÃ?SUD, et tÃ¤psustada valikuid Ã¼heaegselt)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Tere tulemast BridgeDB-sse!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Hetkel toetatud transport TYPE\\'id"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Tervist, sÃµber!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Avalikud VÃµtmed"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "See e-mail loodi vikerkaarte, Ã¼kssarvikute ja sÃ¤demetega\n%s -le, %s kell %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +214,7 @@ msgid ""
 msgstr "BridgeDB pakub sildu mitmete %stÃ¼Ã¼pide Pluggable Transports%s,\nmis aitavad varjutada sinu Ã¼hendust Tor Network\\'ile, raskendades\nkÃµikide sinu vÃµrguliiklust jÃ¤lgivate isikute pingutusi sinu tuvastamiseks\nkasutades Tor-i.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -242,7 +226,7 @@ msgstr "MÃµned sillad IPv6 aadressidega on samuti saadaval, kuigi mÃµned Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +235,169 @@ msgid ""
 "\n"
 msgstr "Lisaks on BridgeDB-l ka palju tavapÃ¤raseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis vÃµib-olla ei kÃµla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kÃµrvale pÃµigata.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Mis on sillad?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Sillad %s on Tor-i releed, mis aitavad internetitsensuuri eest kÃµrvale pÃµigata."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Mul on vaja teist viisi sildade saamiseks!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sildu on vÃµimalik saada ka saates e-maili jÃ¤rgnevale aadressile: %s. Palun pange\ntÃ¤hele, et peate saatma e-maili selliselt aadressilt, mis kasutab Ã¼hte jÃ¤rgnevatest e-maili teenusepakkujatest:\n%s, %s vÃµi %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mu sillad ei tÃ¶Ã¶ta! Vajan abi!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kui Teil Tor ei tÃ¶Ã¶ta, saatke e-mail aadressile %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Proovige lisada vÃµimalikult palju informatsioon seoses oma juhtumiga, lisades jÃ¤rjendi sildadest ja\nPluggable Transports\\'idest, mida Te Ã¼ritasite kasutada; oma Tor brauseri versioon\nja kÃµik teated, mida Tor sulle edastas jne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Siin on teie silla read:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr "Hangi sillad!"
+msgstr "Hangi sildasid!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Silla levitamise vahendid"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "puudub"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Palun valige silla tÃ¼Ã¼p:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Kas teil on vaja IPv6 aadresse?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Kas teil on vaja %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Sisestage Ã¼lemisel pildil olevad sÃ¼mbolid..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Kuidas alustada oma sildade kasutamist"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Kas Teie Internetiteenuse pakkuja (ISP) blokeerib vÃµi tsensoreerib Ã¼hendusi Tor\\'i vÃµrku?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Valige \"Jah\" ja klikkige \"JÃ¤rgmine\". Et seadistada oma uusi sildu, kopeeri ja kleebi silla read teksti sisendikasti. LÃµpetuseks vajutage \"Ã?henda\", ja kÃµik peaks toimima! Kui Teil tekib probleeme, proovige klikkida \"Abi\" nuppu, mis asub \"Tor\\'i vÃµrgu seaded\" nÃµustajas edasise abi saamiseks."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "NÃ¤itab seda teadet."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Esita pÃ¤ring tavaliste sildade jaoks."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Esita pÃ¤ring IPv6 sildade jaoks."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Esita pÃ¤ring Pluggable Transpordi jaoks TYPE jÃ¤rgi."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Hangi koopia BridgeDB GnuPG avalikust vÃµtmest."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
index e6e956c..3e7ab1c 100644
--- a/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,406 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2013
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2011, 2012
+# baldarra, 2013
+# Aritz Jorge SÃ¡nchez <aritz.jorge@xxxxxxxxxxxxxx>, 2015
+# baldarra, 2011, 2012
+# David GarcÃa-Abad <dgarciabad@xxxxxxxxx>, 2018
+# Egoitz Rodriguez <egoitzro@xxxxxxxxx>, 2014
+# Eneko, 2015
+# javikitz <javikitz@xxxxxxxxxxxxxx>, 2015
+# Osoitz <oelkoro@xxxxxxxxx>, 2019
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-09 15:19+0000\n"
-"Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxx>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/bridgedb/templates/base.html:33
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Eman errore baten berri"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Iturburu-kodea"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Changelog-a"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Hautatu dena"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Erakutsi QR Kodea"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kodea zubi-lerroentzarako"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Akats bat egon da zure QR kodea lortzen."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QR kode hau zure zubi-lerroak dauzka. Eskaneatu QR kode irakurle batekin kopiatzeko mugikorrean edo beste gailutan."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Momentuz ez daude zubirik..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Agian saiatu  %s atzera itzuli %s eta beste zubi mota bat aukeratzen!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Jaitsi %s Tor Nabigatzailea %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Eskuratu %s zubiak %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Orain %s gehitu zubiak Torera %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust emaidazu zubiak!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Aukera Aurreratuak"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ez"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Bat ere ez."
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sB%sai!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Hona hemen zure zubiak:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Pasatu zara denbora-mugatik. Mesedez, motela-behera! Gutxienezko denbora dago\nemails %s ordutan. Email guztiak denbora-periodo horretan baztertuko dira."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Zer dira zubiak?"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:79
 #, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s zubi erreleak zentsura sahiesten laguntzen zaituzten %s Tor erreleak dira."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
 
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
 
-#: lib/bridgedb/templates/base.html:40
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Zubi publikoen helbideak aurkitzeko beste modu bat eposta (%s edo %s helbide batetik) bat bidaltzea da %sera 'get bridges' lerroarekin mezuaren gorputzean bertan."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
 #, python-format
 msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Zure Torek funtzionatzen ez badu, %sera email bat idatzi beharko zenuke. Saiatu zure kasuaren inguruan ahalik eta informazio gehien sartzen, erabili dituzun zubien zerrenda, erabili duzun bundlearen fitxategi izena/bertsioa, Torek eman dizkizun mezuak, eta abar barne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:10
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Zubiak Lortu!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Gaineko lerroak erabiltzeko, joan zaitez Vidaliaren sare ezarpenenak orrira, eta sakatu \"Nire Internet Zerbitzu Hornitzaileak Tor sarera konektatzea blokeatzen dit\". Ondoren gehitu ezazu zubi helbide bakoitza banan banan."
+"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 ""
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ez dago zubirik eskuragarri oraintxe bertan."
+#: bridgedb/strings.py:115
+#, 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 ""
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Berritu zure nabigatzailea Firefoxera"
+#: bridgedb/strings.py:119
+#, 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 ""
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Idatzi itzazu bi hitzak"
+#: bridgedb/strings.py:125
+#, 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 ""
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. pausua"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:130
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Eskuratu %s Tor Browser Bundlea %s"
+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 ""
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. pausua"
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Bat ere ez"
+
+#: bridgedb/strings.py:138
+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 ""
 
-#: lib/bridgedb/templates/index.html:15
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "IPv6 helbideak behar dituzu?"
+
+#: bridgedb/strings.py:150
 #, python-format
-msgid "Get %s bridges %s"
-msgstr "Eskuratu %s zubiak %s"
+msgid "Do you need a %s?"
+msgstr "%s behar duzu?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. pausua"
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Sartu goiko irudiko karaktereak..."
 
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Nola hasi zure zubiak erabiltzen"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Orain %s gehitu zubiak Torera %s"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
index e2b03a0..30376d4 100644
--- a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,16 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # arashaalaei <aalaeiarash@xxxxxxxxx>, 2011
+# Ali A, 2019
 # signal89, 2014
 # Amir Moezzi <amirreza.mz@xxxxxxxxx>, 2017
 # ardeshir, 2013
 # Ehsan Ab <a.ehsan70@xxxxxxxxx>, 2015
 # NoProfile, 2014-2015
+# Hamid reza Zaefarani, 2019-2020
 # johnholzer <johnholtzer123@xxxxxxxxx>, 2014
 # Mehrad Rousta <mehrad77@xxxxxxxxx>, 2018
 # Mohammad Hossein <desmati@xxxxxxxxx>, 2014
@@ -17,149 +18,166 @@
 # perspolis <rezarms@xxxxxxxxx>, 2011
 # masoudd <relive.mn@xxxxxxxxx>, 2018
 # Setareh <setareh.salehee@xxxxxxxxx>, 2014
+# Seyyed Hossein Darvari <xhdix@xxxxxxxxx>, 2020
+# Vox, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-17 08:33+0000\n"
-"Last-Translator: MYZJ\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 15:15+0000\n"
+"Last-Translator: Seyyed Hossein Darvari <xhdix@xxxxxxxxx>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ù?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø¯Ø± Ø±Ø§Ø¨Ø·Ù? Ø¨Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø®Ø·Ø§Û?Û? Ø±Ø® Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø²Ø¨Ø§Ù?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
-msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
+msgstr "Ú¯Ø²Ø§Ø±Ø´ Ø§Ø´Ú©Ø§Ù? Ø¯Ø± Ø¨Ø±Ù?Ø§Ù?Ù?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ØªÙ?Ø§Ø³"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ù?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ù?Ù?Ø§Û?Ø´ QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode Ø¨Ø±Ø§Û? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ø§Û? Ù?Ø§Û?Ø? Ù?ØªØ§Ø³Ù?Û?Ù?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Ø¯Ø± Ø¯Ø±Û?Ø§Ù?Øª QRCode Ø¨Ø±Ø§Û? Ø´Ù?Ø§Ø? Ø®Ø·Ø§ Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø´Øª."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ø§Û?Ù? QRCode Ø´Ø§Ù?Ù? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§ Ù?Û? Ø¨Ø§Ø´Ø¯. Ø¢Ù? Ø±Ø§ Ø¨Ø§ Û?Ú© Ø¨Ø±Ù?Ø§Ù?Ù? QRCodeØ®Ù?Ø§Ù? Ø§Ø³Ú©Ù? Ú©Ù?Û?Ø¯ ØªØ§ Ø¨ØªÙ?Ø§Ù?Û?Ø¯ Ø§Û?Ù? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?Ù?Ø¨Ø§Û?Ù? Ù? Ø³Ø§Û?Ø± Ø¯Ø³ØªÚ¯Ø§Ù? Ù?Ø§Û?ØªØ§Ù? Ù?Û?Ø² Ú©Ù¾Û? Ú©Ù?Û?Ø¯."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB Ø¨Ø§ Ø®Ø·Ø§Û?Û? Ø±Ù?Ø¨Ø±Ù? Ø´Ø¯."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ù?â??Ø§Ú©Ù?Ù?Ù? Ù?Û?Ú? Ù¾Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?Û?Ø³Øª..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Ø´Ø§Û?Ø¯ Ù?Û?Ø§Ø² Ø¨Ø§Ø´Ø¯ ØªØ§ %sØ¨Ù? Ù?Ø±ØÙ?Ù? Ù?Ø¨Ù? Ø¨Ø±Ú¯Ø±Ø¯Û?Ø¯%s Ù? Ú¯Ù?Ù?Ù?â??Û? Ù¾Ù? Ø¯Û?Ú¯Ø±Û? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
+msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Ù?Ø±Ù?Ø±Ú¯Ø± Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª %s Ù¾Ù?â?? Ù?Ø§  %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ø§Ú©Ù?Ù?Ù?Ø? %s Ø§Ù?Ø²Ù?Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
+msgstr "Ø§Ú©Ù?Ù?Ù?Ø? %s Ø§Ù?Ø²Ù?Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Tor %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ù¾Ù? Ù?Ø§ Ø±Ø§ Ø¨Ù?Ù? Ø¨Ø¯Ù?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
-msgstr "Ú¯Ø²Û?Ù?Ù?â??Ù?Ø§Û? Ù¾Û?Ø´Ø±Ù?ØªÙ?"
+msgstr "ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Û?Ø´Ø±Ù?ØªÙ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ù?Ù?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ù?Û?Ú?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sØ¨%sÙ?Ù?!"
@@ -167,69 +185,37 @@ msgstr "%sØ¨%sÙ?Ù?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ¯%sØ±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ø§Û?Ù? Û?Ú© Ù¾Û?Ø§Ù? Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Û?â??Ø¨Ø§Ø´Ø¯Ø? Ù?Ø·Ù?Ø§ Ù¾Ø§Ø³Ø® Ù?Ø¯Ù?Û?Ø¯.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ø§Û?Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Û?â??Ø¨Ø§Ø´Ø¯.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ù?Ù?Ø±Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø´Ù?Ø§:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ø´Ù?Ø§ Ø§Ø² ØØ¯ Ù?Ø¬Ø§Ø² ØªØ¬Ø§Ù?Ø² Ù?Ù?Ù?Ø¯Ù? Ø§Û?Ø¯. Ù?Ø·Ù?Ø§Ù? Ù¾Ø´Øª Ø³Ø± Ù?Ù? Ø§Û?Ù?Û?Ù? Ù?Ù?Ø±Ø³ØªÛ?Ø¯. ØØ¯Ø§Ù?Ù? Ø²Ù?Ø§Ù? Ø¨Û?Ù?\nØ§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ù?Ø§Ø? %s Ø³Ø§Ø¹Øª Ø§Ø³Øª. ØªÙ?Ø§Ù?Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø¨Ø¹Ø¯Û? Ø¯Ø± Ø§Û?Ù? Ø¨Ø§Ø²Ù?â??Û? Ø²Ù?Ø§Ù?Û?Ø? Ù?Ø§Ø¯Û?Ø¯Ù? Ú¯Ø±Ù?ØªÙ? Ù?Û? Ø´Ù?Ù?Ø¯."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ø¯Ø³ØªÙ?Ø±Ø§Øª: (Ø¨Ø±Ø§Û? Ù?Ø´Ø®Øµ Ú©Ø±Ø¯Ù? Ú?Ù?Ø¯Û?Ù? Ú¯Ø²Û?Ù?Ù? Ø¨Ù? Ø·Ù?Ø± Ù?Ù?Ø²Ù?Ø§Ù?Ø? Ø¯Ø³ØªÙ?Ø±Ø§Øª Ø±Ø§ Ø¨Ø§ Ù?Ù? ØªØ±Ú©Û?Ø¨ Ú©Ù?Û?Ø¯)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ø¨Ù? BridgeDB Ø®Ù?Ø´â??Ø¢Ù?Ø¯Û?Ø¯!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø±Ø? Ø§Ø² Ø§Û?Ù? transport TYPE Ù?Ø§ Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ù?Û? Ø´Ù?Ø¯:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ø³Ù?Ø§Ù?Ø?  %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³Øª Ù?Ù?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ú©Ù?Û?Ø¯Ù?Ø§Û? Ø¹Ù?Ù?Ù?Û?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø·Ù?Ø± Ø®Ù?Ø¯Ú©Ø§Ø± Ø¨Ù?Ø³Û?Ù?Ù? rainbowsØ? unicorns Ù? sparkles \n Ø¨Ø±Ø§Û?%s Ø¨Ø±  %s Ø¯Ø±  %s ØªÙ?Ù?Û?Ø¯ Ø´Ø¯Ù? Ø§Ø³Øª."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ø§Ú¯Ø± Ø§Û?Ù? Ù¾Ù?â??Ù?Ø§ Ø¢Ù? Ú?Û?Ø²Û? Ù?Û?Ø³ØªÙ?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø? Ø¨Ø§ Û?Ú©Û? Ø§Ø² Ø¯Ø³ØªÙ?Ø±Ø§Øª Ø²Û?Ø± Ø¯Ø± Ù?ØªÙ? Ù¾Û?Ø§Ù?Ø? Ø¨Ù? Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ù¾Ø§Ø³Ø® Ø¯Ù?Û?Ø¯:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,10 +223,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ù?Û? ØªÙ?Ø§Ù?Ø¯ Ù¾Ù? Ù?Ø§Û?Û? Ø¨Ø§ Ú?Ù?Ø¯Û?Ù? %sÙ?Ù?Ø¹ Ù?ØªØ¹Ø¯Ø¯ Ø§Ø² Pluggable Transports%s Ù?Ø±Ø§Ù?Ù? Ú©Ù?Ø¯Ø?\n Ú©Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?Ø¯ Ø§ØªØµØ§Ù? Ø´Ù?Ø§ Ø¨Ù? Ø´Ø¨Ú©Ù? Tor ØªØ§ ØØ¯ Ø§Ù?Ú©Ø§Ù? Ù?Ø¨Ù?Ù? Ù? Ù?Ø§Ø´Ù?Ø§Ø³ Ø¨Ø§Ù?Û? Ø¨Ù?Ø§Ù?Ø¯.\n Ø¨Ø§ Ø§Û?Ù? Ú©Ø§Ø±Ø? Ø§Ù?Ø±Ø§Ø¯Û? Ú©Ù? Ø¨Ø± ØªØ±Ø§Ù?Û?Ú© Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ Ù?Ø¸Ø§Ø±Øª Ù?Û? Ú©Ù?Ù?Ø¯Ø? Ø¨Ù? Ø³Ø®ØªÛ? Ù?Û? ØªÙ?Ø§Ù?Ù?Ø¯ ØªØ´Ø®Û?Øµ Ø¯Ù?Ù?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ù? ØªÙ?Ø± Ù?ØµÙ? Ø´Ø¯Ù? Ø§Û?Ø¯.\n"
+msgstr "BridgeDB Ù?Û? ØªÙ?Ø§Ù?Ø¯ Ù¾Ù? Ù?Ø§Û?Û? Ø¨Ø§ Ú?Ù?Ø¯Û?Ù? %sÙ?Ù?Ø¹ Ù?ØªØ¹Ø¯Ø¯ Ø§Ø² Pluggable Transports%s Ù?Ø±Ø§Ù?Ù? Ú©Ù?Ø¯Ø?\n Ú©Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?Ø¯ Ø§ØªØµØ§Ù? Ø´Ù?Ø§ Ø¨Ù? Ø´Ø¨Ú©Ù? Tor ØªØ§ ØØ¯ Ø§Ù?Ú©Ø§Ù? Ù?Ø¨Ù?Ù? Ù? Ù?Ø§Ø´Ù?Ø§Ø³ Ø¨Ø§Ù?Û? Ø¨Ù?Ø§Ù?Ø¯.\n Ø¨Ø§ Ø§Û?Ù? Ú©Ø§Ø±Ø? Ø§Ù?Ø±Ø§Ø¯Û? Ú©Ù? Ø¨Ø± ØªØ±Ø§Ù?Û?Ú© Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ Ù?Ø¸Ø§Ø±Øª Ù?Û? Ú©Ù?Ù?Ø¯Ø? Ø¨Ù? Ø³Ø®ØªÛ? Ù?Û? ØªÙ?Ø§Ù?Ù?Ø¯ ØªØ´Ø®Û?Øµ Ø¯Ù?Ù?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ù? Tor Ù?ØµÙ? Ø´Ø¯Ù? Ø§Û?Ø¯.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -252,7 +238,7 @@ msgstr "Ø¨Ø¹Ø¶Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§ Ø¨Ø§ Ø¢Ø¯Ø±Ø³â??Ù?Ø§Û? IPv6 Ù?Û?Ø² Ø¯Ø± Ø¯Ø³Øª
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -261,134 +247,169 @@ msgid ""
 "\n"
 msgstr "Ù?Ù?Ú?Ù?Û?Ù? BridgeDB Ø´Ø§Ù?Ù? ØªØ¹Ø¯Ø§Ø¯ Ø²Û?Ø§Ø¯Û? Ù¾Ù? Ù?Ø§Û? Ø§Ø¨ØªØ¯Ø§Û?Û? Ù? Ù?Ø¯Û?Ù?Û? Ø§Ø³Øª Ú©Ù? %s Pluggable Transports Ù?Ø¯Ø§Ø±Ù?Ø¯ %s Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Û? Ù?ØµØ±Ù? Ø¨Ù? Ù?Ø¸Ø± Ø¨Ø±Ø³Ù?Ø¯ Ø§Ù?Ø§ Ù?Ù?Ú?Ù?Ø§Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¯Ø± Ù?Ù?Ø§Ø±Ø¯ Ù?ØªØ¹Ø¯Ø¯Û? Ø¬Ù?Øª Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Û?Ù?ØªØ±Û?Ù?Ú¯ Ø¨Ù? Ø´Ù?Ø§ Ú©Ù?Ú© Ú©Ù?Ù?Ø¯.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ù¾Ù? Ù?Ø§ Ú?Ù? Ù?Ø³ØªÙ?Ø¯Ø?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ù¾Ù? Ù?Ø§ %s Ù?Ø³ØªÙ?Ø¯ Ø¨Ø§Ø²Ù¾Ø®Ø´ Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? ØªÙ?Ø± Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¨Ù? Ø´Ù?Ø§ Ø¨Ø±Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ø³Ø§Ù?Ø³Ù?Ø±Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?Ø¯ ."
+msgstr "%s Ù¾Ù? Ù?Ø§ %s Ù?Ø³ØªÙ?Ø¯ Ø¨Ø§Ø²Ù¾Ø®Ø´ Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¨Ù? Ø´Ù?Ø§ Ø¨Ø±Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ø³Ø§Ù?Ø³Ù?Ø± Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?Ø¯ ."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ø¨Ù? Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª bridge Ù?Ø§ Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Û?Ú© Ø·Ø±Û?Ù? Ø¯Û?Ú¯Ø±Û? Ú©Ù? Ù?Û?ØªÙ?Ø§Ù?Û?Ø¯ Ù¾Ù?Ù?Ø§ Ø±Ø§ Ø¨Ú¯Û?Ø±Û?Ø¯, Ø§Ø² Ø·Ø±Û?Ù? Ù?Ø²Ø³ØªØ§Ø¯Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? %s  Ù?Û?Ø¨Ø§Ø´Ø¯. Ù?Ø·Ù?Ø§ Ø¯Ù?Øª Ù?Ø± Ù?Ø§Û?Û?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯ Ø±Ø§ ØØªÙ?Ø§ Ø§Ø² Û?Ú©Û? Ø§Ø² Ù?Ø±Ø§Ù?Ù?Ú©Ù?Ù?Ø¯ Ú¯Ø§Ù? Ø§Û?Ù?Û?Ù?Û? Ø²Û?Ø± Ø¨Ù?Ø±Ø³ØªÛ?Ø°:    %s   %s  Ù? Û?Ø§  %s  ."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù? Ù?Ø§Ø? Ù?Ø±Ø³ØªØ§Ø¯Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? %s Ø§Ø³Øª. \nØ¹Ù?Ù?Ø§Ù? Ø±Ø§ Ø®Ø§Ù?Û? Ø¨Ú¯Ø°Ø§Ø±Û?Ø¯ Ù? Ø¯Ø± Ù?ØªÙ? Ù¾Û?Ø§Ù? \"get transport obfs4\" Ø¨Ù?Ù?Û?Ø³Û?Ø¯. \nÙ?Ø·Ù?Ø§ ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ø±Ø§ Ø§Ø² Ø·Ø±Û?Ù? Û?Ú©Û? Ø§Ø² Ø³Ø±Ù?Û?Ø³ Ø¯Ù?Ù?Ø¯Ù? Ù?Ø§Û? \nØ§Û?Ù?Û?Ù? %s Û?Ø§ %s Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ø¨Ù? Ú©Ù?Ú© Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?! Ù¾Ù?â??Ù?Ø§Û? Ù?Ù? Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ù?Ø¯!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ø§Ú¯Ø± ØªÙ?Ø± Ø´Ù?Ø§ Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯, Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ú©Ù?Û?Ø¯ %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ø³Ø¹Û? Ú©Ù?Û?Ø¯ ØªØ§ Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±Û? Ø±Ø§ Ù?Ø±Ø§Ù?Ù? Ú©Ù?Û?Ø¯. Ø§Ø² Ø¬Ù?Ù?Ù? Ù?Û?Ø³Øª Ù¾Ù? Ù?Ø§ Ù? Pluggable Transports Ù?Ø§Û?Û? Ú©Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ø¯. Ù?Ù?Ú?Ù?Û?Ù? Ø´Ù?Ø§Ø±Ù? Ù?Ø³Ø®Ù? Tor Browser Ù? Ù?Ø± Ù¾Û?ØºØ§Ù?Û? Ú©Ù? Tor Ø¨Ù? Ø´Ù?Ø§ Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ø§Ú¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø´Ù?Ø§ Ù?Ø§Ø¯Ø± Ø¨Ù? Ø§ØªØµØ§Ù? Ù?Û?Ø³Øª Ø? Ù?Ø·Ù?Ø§Ù? Ø¨Ù? %s Ù? %s Ù?Ø§ Ù?Ú¯Ø§Ù?Û? Ø¨Û?Ù?Ø¯Ø§Ø²Û?Ø¯."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ø®Ø·Ù?Ø· Ù¾Ù? Ø´Ù?Ø§ Ø¯Ø± Ø§Û?Ù?Ø¬Ø§:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ù?Ú©Ø§Ù?Û?Ø²Ù?â??Ù?Ø§Û? ØªÙ?Ø²Û?Ø¹ Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 Ø§Ø² Ú?Ù?Ø§Ø± Ù?Ú©Ø§Ù?Û?Ø²Ù? Ø¨Ø±Ø§Û? ØªÙ?Ø²Û?Ø¹ Ù¾Ù?â??Ù?Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û?â??Ú©Ù?Ø¯: \"HTTPS\"Ø? \"MoatØ?\n \"Ø§Û?Ù?Û?Ù?\" Ù? \"Ø±Ø²Ø±Ù?\". Ù¾Ù?â??Ù?Ø§Û?Û? Ú©Ù? Ø§Ø² Ø·Ø±Û?Ù? BridgeDB ØªÙ?Ø²Û?Ø¹ Ù?Ù?Û?â??Ø´Ù?Ù?Ø¯Ø?\nØ§Ø² Ø´Ø¨Ù? Ù?Ú©Ø§Ù?Û?Ø²Ù? \"None\" Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û?â??Ú©Ù?Ù?Ø¯. Ù?Û?Ø³Øª Ø²Û?Ø± Ø¨Ù? ØµÙ?Ø±Øª Ø®Ù?Ø§ØµÙ? ØªÙ?Ø¶Û?Ø Ù?Û?â??Ø¯Ù?Ø¯\nÚ©Ù? Ù?Ø± Ú©Ø¯Ø§Ù? Ø§Ø² Ø§Û?Ù? Ù?Ú©Ø§Ù?Û?Ø²Ù?â??Ù?Ø§ Ú?Ø·Ù?Ø± Ú©Ø§Ø± Ù?Û?â??Ú©Ù?Ù?Ø¯ Ù? %sÙ?Ø¹Û?Ø§Ø±Ù?Ø§Û? BridgeDB%s Ù?ØØ¨Ù?Ø¨Û?Øª Ù?Ø±Ú©Ø¯Ø§Ù?\nØ§Ø² Ù?Ú©Ø§Ù?Û?Ø²Ù?â??Ù?Ø§ Ø±Ø§ Ù?Ø´Ø§Ù? Ù?Û?â??Ø¯Ù?Ø¯."
+
+#: bridgedb/strings.py:115
+#, 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 "Ù?Ú©Ø§Ù?Û?Ø²Ù? ØªÙ?Ø²Û?Ø¹ \"HTTPS\" Ù¾Ù?â??Ù?Ø§ Ø±Ø§ Ø§Ø² Ø·Ø±Û?Ù? Ø§Û?Ù? Ù?Ø¨Ø³Ø§Û?Øª Ø§Ø±Ø§Ø¦Ù? Ù?Û?â??Ú©Ù?Ø¯. Ø¨Ø±Ø§Û? \nØ¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§ Ø¨Ù? %sbridges.torproject.org%s Ø±Ù?ØªÙ?Ø? Ú¯Ø²Û?Ù?Ù?â??Û? Ù?Ø¯ Ù?Ø¸Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù? Ù? Ú©Ø¯ CAPTCHA Ø±Ø§ ØÙ? Ú©Ù?Û?Ø¯."
+
+#: bridgedb/strings.py:119
+#, 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 "Ù?Ú©Ø§Ù?Û?Ø²Ù? ØªÙ?Ø²Û?Ø¹ \"Moat\" Ø¨Ø®Ø´Û? Ø§Ø² Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø§Ø³Øª Ú©Ù? Ø¨Ù? Ú©Ø§Ø±Ø¨Ø±Ø§Ù? Ø§Ø¬Ø§Ø²Ù? Ù?Û?â??Ø¯Ù?Ø¯\nÚ©Ù? Ù¾Ù?â??Ù?Ø§ Ø±Ø§ Ø§Ø² Ø¯Ø§Ø®Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø¯Ù?Ù?Ø¯. Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§ Ø¨Ù?\n%sØªÙ?Ø¸Û?Ù?Ø§Øª ØªÙ?Ø±%s Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø®Ù?Ø¯ Ø±Ù?ØªÙ?Ø? Ø¨Ø± Ø±Ù?Û? \"Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù? Ø¬Ø¯Û?Ø¯\" Ú©Ù?Û?Ú© Ù? Ú©Ø¯ CAPTCHA\nØ±Ø§ ØÙ? Ú©Ù?Û?Ø¯. Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø¨Ù? ØµÙ?Ø±Øª Ø®Ù?Ø¯Ú©Ø§Ø± Ù¾Ù? Ø¬Ø¯Û?Ø¯ Ø±Ø§\nØ§Ø¶Ø§Ù?Ù? Ø®Ù?Ø§Ù?Ø¯ Ú©Ø±Ø¯."
+
+#: bridgedb/strings.py:125
+#, 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 "Ú©Ø§Ø±Ø¨Ø±Ø§Ù? Ù?Û?â??ØªÙ?Ø§Ù?Ù?Ø¯ Ø¨Ø§ Ù?Ú©Ø§Ù?Û?Ø²Ù? ØªÙ?Ø²Û?Ø¹ \"Ø§Û?Ù?Û?Ù?\" Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù? Ø¯Ù?Ù?Ø¯. Ø¨Ø±Ø§Û? Ø§Û?Ù? Ú©Ø§Ø± Ø¨Ù?\n%sbridges@xxxxxxxxxxxxxx%s Ø§Û?Ù?Û?Ù? Ø¯Ø§Ø¯Ù? Ù? Ø¨Ù? Ø¹Ù?Ù?Ø§Ù? Ù?ØªÙ? Ø§Û?Ù?Û?Ù? Ø¹Ø¨Ø§Ø±Øª\nget transport obfs4\" Ø±Ø§ Ø¨Ù?Ù?Û?Ø³Û?Ø¯."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Ø±Ø²Ø±Ù? Ø´Ø¯Ù?"
+
+#: bridgedb/strings.py:130
+#, 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 Ø´Ø§Ù?Ù? ØªØ¹Ø¯Ø§Ø¯ Ú©Ù?Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û?Û? Ø§Ø³Øª Ú©Ù? Ø¨Ù? ØµÙ?Ø±Øª Ø®Ù?Ø¯Ú©Ø§Ø± ØªÙ?Ø²Û?Ø¹ Ù?Ù?Û?â??Ú¯Ø±Ø¯Ù?Ø¯.\nØ¨Ù?Ú©Ù? Ù?Ø§ Ø§Û?Ù? Ù¾Ù?â??Ù?Ø§ Ø±Ø§ Ø¨Ø±Ø§Û? ØªÙ?Ø²Û?Ø¹ Ø¯Ø³ØªÛ? Ø±Ø²Ø±Ù? Ú©Ø±Ø¯Ù? Ù?\nØªØÙ?Û?Ù? NGOÙ?Ø§ Ù? Ø³Ø§Û?Ø± Ù?Ù?Ø§Ø¯Ù?Ø§ Ù? Ø§Ù?Ø±Ø§Ø¯Û? Ú©Ù? Ù?Û?Ø§Ø² Ø¨Ù? Ø¢Ù? Ø¯Ø§Ø±Ù?Ø¯\nÙ?Û?â??Ø¯Ù?Û?Ù?. Ù¾Ù?â??Ù?Ø§Û?Û? Ú©Ù? Ø¨Ø§ Ù?Ú©Ø§Ù?Û?Ø²Ù? \"Ø±Ø²Ø±Ù?\" ØªÙ?Ø²Û?Ø¹ Ù?Û?â??Ú¯Ø±Ø¯Ù?Ø¯ Ù?Ù?Ú©Ù? Ø§Ø³Øª ØªØ§\nÙ?Ø¯Øª Ø·Ù?Ù?Ø§Ù?Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Ú¯Ø±Ø¯Ù?Ø¯. Ø¯Ø± Ù?Ø¸Ø± Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ù?Ú©Ø§Ù?Û?Ø² ØªÙ?Ø²Û?Ø¹ \"Ø±Ø²Ø±Ù?\" Ø¯Ø± Ù?Ø§Û?Ù? %sÙ?Ø®Ø²Ù? Ù?Ø§Ú¯Ø°Ø§Ø±Û? Ù¾Ù?%s Ø¨Ø§ Ù?Ø§Ù? \"ØªØ®ØµÛ?Øµ Ù?Û?Ø§Ù?ØªÙ?\" Ø´Ù?Ø§Ø®ØªÙ? Ù?Û?â??Ø´Ù?Ø¯."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ù?Û?Ú?"
+
+#: bridgedb/strings.py:138
+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 ØªÙ?Ø²Û?Ø¹ Ù?Ù?Û? Ø´Ù?Ù?Ø¯.\nØ§Û?Ù? Ù?Ø¸Û?Ù?Ù? Ø§Ù¾Ø±Ø§ØªÙ?Ø± Ù¾Ù? Ø§Ø³Øª Ú©Ù? Ø¨ØªÙ?Ø§Ù?Ø¯ Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ Ø¨Ø±Ø§Û? Ú©Ø§Ø±Ø¨Ø±Ø§Ù? ØªÙ?Ø²Û?Ø¹ Ú©Ù?Ø¯. ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø¯Ø± Ø¬Ø³ØªØ¬Ù?Û? Ø±Ù?Ù?Ø? Ø³Ø§Ø²â??Ù?â??Ú©Ø§Ø± ØªÙ?Ø²Û?Ø¹ Û?Ú© Ù¾Ù? ØªØ§Ø²Ù? Ù?ØµØ¨ Ø´Ø¯Ù? ØØ¯Ø§Ú©Ø«Ø± ØªØ§ ØØ¯Ù?Ø¯ Û?Ú© Ø±Ù?Ø² \"Ù?Û?Ú?\" Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯.\n Ú©Ù?Û? ØµØ¨Ù?Ø± Ø¨Ø§Ø´Û?Ø¯Ø? Ù?Ø¶Ø¹Û?Øª Ø¢Ù? Ø¨Ù? Ø³Ø§Ø²â??Ù?Ú©Ø§Ø± ØªÙ?Ø²Û?Ø¹ Ù?Ø§Ù?Ø¹Û? Ù¾Ù? ØªØºÛ?Û?Ø± Ø®Ù?Ø§Ù?Ø¯ Ú©Ø±Ø¯.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ø·Ù?Ø§ Ú¯Ø²Û?Ù?Ù? Ù?Ù?Ø¹ Ù¾Ù? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? IPv6 Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯ Ø¨Ù? Û?Ú© %sØ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?Ø±Ù?Ø±Ú¯Ø± Ø´Ù?Ø§ ØªØµØ§Ù?Û?Ø± Ø±Ø§ Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ù?Ù?Ø§Û?Ø´ Ù?Ù?Û? Ø¯Ù?Ø¯."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ú©Ø§Ø±Ø§Ú©ØªØ± Ù?Ø§ Ø±Ø§ Ø§Ø² ØªØµÙ?Û?Ø± Ø¨Ø§Ù?Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ø¨Ø±Ø§Û? Ù?Ø±Ù?Ø¯ Ø¨Ù? Ù¾Ù? Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø? Ø¨Ø±Ø§Û? Ø§Ù?Ù?Û?Ù? Ø¨Ø§Ø± %s Ø¨Ù? Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø±Ù?Ø±Ú¯Ø± Tor \nØµÙ?ØÙ? %s Ù? Ù¾Ø³ Ø§Ø² Ø¢Ù? Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Ø¯Ø³ØªÙ?Ø±Ø§Ù?Ø¹Ù?Ù?  Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø²\nÙ?Ø±Ù?Ø±Ú¯Ø± Tor Ø¨Ø±Ù?Û?Ø¯."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ø§Ø¨ØªØ¯Ø§Ø? Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¨Ù? %sØ¨Ø§Ø±Ú¯Û?Ø±Û? Ù?Ø±Ù?Ø±â??Ú¯Ø± ØªÙ?Ø±%s Ø¯Ø§Ø±Û?Ø¯. Ø¯Ù?ØªØ±Ú?Ù? Ø±Ø§Ù?Ù?Ù?Ø§ Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ù?Ø§Ø? ØªÙ?Ø¶Û?Ø Ù?Û?â??Ø¯Ù?Ø¯ Ú©Ù? Ú?Ú¯Ù?Ù?Ù? Ù?Û?â??ØªÙ?Ø§Ù?Û?Ø¯ Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø§Ø¶Ø§Ù?Ù? Ú©Ù?Û?Ø¯\nØ§Ú¯Ø± Ø´Ù?Ø§ Ø§Ø² Ù?Û?Ù?Ø¯Ù?Ø²Ø? Ù?Û?Ù?Ù?Ú©Ø³ Û?Ø§ Ù?Ú© Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û?â??Ú©Ù?Û?Ø¯Ø? Ø¨Ø±Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ± %s Ø§Û?Ù?Ø¬Ø§ Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯%s. Ø§Ú¯Ø± Ø´Ù?Ø§ Â  Ø§Ø² Ø§Ù?Ø¯Ø±Ù?Û?Ø¯ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û?â??Ú©ØªÛ?Ø¯Ø?%sØ§Û?Ù?Ø¬Ø§ Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ù?Ù?ØªÛ? Ú©Ù? ØµÙ?ØÙ?  'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' Ù?Ù?Ø§Û?Ø´ Ø¯Ø§Ø¯Ù? Ø´Ø¯, Ø±Ù?Û? Ú¯Ø²Û?Ù?Ù? 'Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ù? Ø¯Ù?Ø¨Ø§Ù? Ú©Ù?Û?Ø¯\nØªØ§ Ø²Ù?Ø§Ù?Û? Ú©Ù? wizard Ø§Ø² Ø´Ù?Ø§ Ø¨Ù¾Ø±Ø³Ø¯:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Ø§Û?Ù? Ù¾Ù?â??Ù?Ø§ Ø±Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø®Ù?Ø¯Ø? Ø¨Ø§ Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ù?Ø±Ù?Ø±Ú¯Ø±Ø? Ú©Ù?Û?Ú© Ø¨Ø± Ø±Ù?Û? \"Tor\"Ø? Ù? Ø³Ù¾Ø³ Ø§Ø¶Ø§Ù?Ù? Ú©Ø±Ø¯Ù? Ø¢Ù?Ù?Ø§ Ø¨Ù? Ø¨Ø®Ø´ \"Ø§Ø±Ø§Ø¦Ù? Û?Ú© Ù¾Ù?\"Ø? Ø§Ø¶Ø§Ù?Ù? Ú©Ù?Û?Ø¯."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ø¢Û?Ø§ Ø´Ø±Ú©Øª Ø§Ø±Ø§Û?Ù? Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª (ISP) Ø´Ù?Ø§ Ø¨Ù?Ø§Ú© Ù?Û? Ú©Ù?Ø¯ Ù? Û?Ø§ Ø³Ø§Ù?Ø³Ù?Ø± Ù?Û? Ú©Ù?Ø¯ Ø§Ø±ØªØ¨Ø§Ø·Ø§Øª\nØ´Ø¨Ú©Ù? ØªÙ?Ø± Ø´Ù?Ø§ Ø±Ø§Ø?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? ØªÙ?Ø± Ù?Ø§â??Ù?Ø¨Ù?Ù?.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'Ø¨Ù?Ù?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù? Ù? Ø³Ù¾Ø³ 'Ø¨Ø¹Ø¯Û?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. Ø¨Ø±Ø§Û? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ø¬Ø¯Û?Ø¯ Ø®Ù?Ø¯, copy Ù? paste Ú©Ù?Û?Ø¯ Ø®Ø·Ù?Ø· Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?ØªÙ? Ø¬Ø¹Ø¨Ù? Ù?Ø±Ù?Ø¯Û?. Ø¯Ø± Ù?Ù?Ø§Û?Øª, Ø±Ù?Û? 'Ø§ØªØµØ§Ù?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯,\nØ±Ø§Ù? Ø¯Ø±Ø³ØªØ´ Ø§Û?Ù? Ø§Ø³Øª! Ø§Ú¯Ø± Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?Ø¯, Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ø±Ù?Û? Ú©Ù?Û?Ø¯ 'Ø±Ø§Ù?Ù?Ù?Ø§'\nØ¯Ø± 'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' wizard Ø¨Ø±Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ø§Û?Ù? Ù¾Û?Ø§Ù? Ø±Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Û?â??Ø¯Ù?Ø¯."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø¹Ø§Ø¯Û?"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ø±Ù?Ø´ Transport Ø¬Ø§Û?Ú¯Ø²Û?Ù? Ø¨Ø±Ø§Ø³Ø§Ø³ TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ø±Ù?Ù?Ù?Ø´Øª Ø§Ø² Ú©Ù?Û?Ø¯Ù? GnuPG Ø¹Ù?Ù?Ù?Û?Ù? BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ù?Ø¨Ù?Ù? obfs4.)"
diff --git a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
index 73a05e2..7aad3f5 100644
--- a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
@@ -1,13 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Hessu Lumberi <pitkahessu@xxxxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2014
 # Spacha <miikasikala96@xxxxxxxxx>, 2015
-# Ossi Kallunki <ossikallunki@xxxxxxxxx>, 2013
+# Ossi K, 2013
 # Pietu1998 <smiley@xxxxxxxxxxxxx>, 2016
 # Riku Viitanen <riisseli4@xxxxxxxxx>, 2015
 # Sami Kuusisto <sami@xxxxxxxx>, 2014
@@ -18,116 +18,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "PyyntÃ¶si epÃ¤onnistui jostain syystÃ¤."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kieli"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ilmoita ohjelmointivirheestÃ¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "LÃ¤hdekoodi"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Muutosloki"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "NÃ¤ytÃ¤ QR-koodi"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Siltariviesi QR-koodi"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Jossain on pulma!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Tapahtui virhe QR-koodia noudettassa."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "TÃ¤mÃ¤ QR-koodi sisÃ¤ltÃ¤Ã¤ siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "TÃ¤llÃ¤ hetkellÃ¤ ei ole yhtÃ¤Ã¤n siltaa saatavilla..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "EhkÃ¤ sinun pitÃ¤isi yrittÃ¤Ã¤ %s palaamalla %s ja valitsemalla eri siltatyyppi!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Vaihe %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Lataa %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Vaihe %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hanki %s sillat %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Vaihe %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
@@ -136,27 +151,27 @@ msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%snna minulle vain sillat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "LisÃ¤valitsimet"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ei mitÃ¤Ã¤n"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sK%syllÃ¤!"
@@ -164,69 +179,37 @@ msgstr "%sK%syllÃ¤!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sae sillat"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[TÃ¤mÃ¤ on automaattinen viesti; Ã¤lÃ¤ vastaa tÃ¤hÃ¤n.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "TÃ¤ssÃ¤ ovat sinun siltasi."
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Olet ylittÃ¤nyt nopeusrajan. Hidasta hiukan! Minimiaika viestien vÃ¤lillÃ¤ on %s tunnissa. Kaikki lisÃ¤viestit tÃ¤mÃ¤n ajan kuluessa ohitetaan."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMENNOT: (yhdistÃ¤ KOMENNOT mÃ¤Ã¤ritellÃ¤ksesi useita valitsimia samanaikaisesti)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Tervetuloa BridgeDB :hen!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Nykyiset tuetut transport TYPE-siirtotyypit:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hei ystÃ¤vÃ¤!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Julkiset avaimet"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "TÃ¤mÃ¤ sÃ¤hkÃ¶posti tuotettiin kÃ¤yttÃ¤jÃ¤lle %s %s klo %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,7 +220,7 @@ msgid ""
 msgstr "BridgeDB voi tarjota usean %styyppisiÃ¤ irrotettavia Pluggable Transports%s-siirtoja,\njotka voivat auttaa peittÃ¤mÃ¤Ã¤n yhteytesi Tor Network-verkkoon, mikÃ¤ tekee vaikeammaksi\nkenellekÃ¤Ã¤n seurata internet-liikennettÃ¤si ottaakseen selvÃ¤Ã¤, ettÃ¤ kÃ¤ytÃ¤tkÃ¶ Tor-palvelua.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -249,7 +232,7 @@ msgstr "MyÃ¶s joitakin siltoja IPv6-osoitteilla on saatavilla, vaikka jotkut irr
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -258,134 +241,169 @@ msgid ""
 "\n"
 msgstr "LisÃ¤ksi BridgeDB:llÃ¤ on useita tavallisia siltoja %s ilman mitÃ¤Ã¤n irrotettavia\nPluggable Transports %s-siirtoja, jotka eivÃ¤t ehkÃ¤ kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertÃ¤mÃ¤Ã¤n internet-sensuuria.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "MitÃ¤ ovat sillat?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s-sillat %s ovat Tor-vÃ¤litysjÃ¤rjestelmiÃ¤, jotka auttavat kiertÃ¤mÃ¤Ã¤n sensurointia."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoitteeseen %s. Huomaa,\nettÃ¤ sinun on lÃ¤hetettÃ¤vÃ¤ sÃ¤hkÃ¶postiviesti kÃ¤yttÃ¤en yhtÃ¤ seuraavien sÃ¤hkÃ¶postitarjoajien\nosoitetta:\n%s, %s tai %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Siltani eivÃ¤t toimi! Tarvitsen apua!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jos Tor ei toimi sinulla, sinun pitÃ¤isi sÃ¤hkÃ¶postittaa %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "YritÃ¤ sisÃ¤llyttÃ¤Ã¤ niin paljon tietoa tapauksestasi kuin voit, mukaanlukien siltojen\nluettelo ja irrotettavat Pluggable Transport-siirrot, joita yritit kÃ¤yttÃ¤Ã¤,\nTor Browser-versio, ja kaikki viestit, jotka Tor ilmoitti, jne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "TÃ¤ssÃ¤ ovat siltarivisi:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Hae sillat!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ei mikÃ¤Ã¤n"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Valitse valitsimet siltatyypille:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Tarvitsetko IPv6-osoitteita?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Tarvitsetko %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Selaimesi ei nÃ¤ytÃ¤ kuvia oikein."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "SyÃ¶tÃ¤ merkit ylÃ¤puolella olevasta kuvasta..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Kuinka aloitat siltojesi kÃ¤ytÃ¶n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "LisÃ¤tÃ¤ksesi siltauksia Tor Browseriin mene %s Tor Browserin lataussivulle %s ja seuraa ohjeita siellÃ¤ ladataksesi ja kÃ¤ynnistÃ¤Ã¤ksesi Tor Browserin."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "EstÃ¤Ã¤kÃ¶ tai sensuroiko Internet-palvelutarjoajasi (ISP) muuten yhteyksiÃ¤\nTor-verkkoon?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Valitse â??KyllÃ¤â?? ja napsauta sitten â??Seuraavaâ??. Uusien siltojen konfiguroimiseksi kopioi ja\nliitÃ¤ siltarivit tekstisyÃ¶teikkunaan. Napsauta lopuksi â??YhdistÃ¤â??, ja siirtymisen pitÃ¤isi\nonnistua! Jos kohtaat pulmia, yritÃ¤ saada lisÃ¤apua napsauttamalla â??Opasteâ??-\npainiketta â??Tor-verkkoasetuksetâ??-asetusvelhossa."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "NÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n viestin."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PyydÃ¤ tavallisia siltoja."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PyydÃ¤ IPv6-siltoja."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PyydÃ¤ TYPE-tyyppistÃ¤ irrotettavaa Pluggable Transport-siirtoa."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 12d091d..57616ff 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -1,10 +1,9 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
-# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2019
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2020
 # apaddlingduck, 2014
 # Boubou <cece31840@xxxxxxxxx>, 2015
 # Cryptie <cryptie@xxxxxxxx>, 2014
@@ -30,116 +29,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-23 19:14+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 14:55+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Langue"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Signaler un bogue"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Code source"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Journal des changements"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Tout sÃ©lectionner"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Afficher le code QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Code QR pour vos lignes de ponts"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Un problÃ¨me est survenuâ??!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Il semble quâ??il y ait eu une erreur de rÃ©cupÃ©ration de votre code QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Ce code QR contient vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont (Bridges) sur vos appareils, mobiles ou autres."
+msgstr "Ce code QR comprend vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "Une erreur de BridgeDB est survenue."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Aucun pont nâ??est disponible actuellementâ?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Vous devriez peut-Ãªtre %s revenir en arriÃ¨re %s et choisir un diffÃ©rent type de pontâ??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ã?tape %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "TÃ©lÃ©chargez %s le NavigateurÂ Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ã?tape %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtenez des %s ponts %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ã?tape %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
@@ -148,27 +162,27 @@ msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Donnez-moi %sj%suste des pontsâ??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Options avancÃ©es"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "aucun"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sO%suiâ??!"
@@ -176,69 +190,37 @@ msgstr "%sO%suiâ??!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtenir des ponts"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ceci est un message automatisÃ© ; veuillez ne pas y rÃ©pondre.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ceci est un courriel automatisÃ©.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
-msgstr "Voici vos ponts :"
+msgstr "Voici vos pontsÂ :"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Vous avez dÃ©passÃ© la limite. Veuillez ralentirâ??! La durÃ©e minimum entre courriels est de %s heures. Tout autre courriel durant cette pÃ©riode sera ignorÃ©."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDES : (combiner des commandes pour spÃ©cifier plusieurs options simultanÃ©ment)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bienvenue Ã  BridgeDBâ??!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPE de transport pris en charge actuellement :"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Bonjour, %sâ??!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Bonjour, lâ??amiâ??!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "ClÃ©s publiques"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ce courriel a Ã©tÃ© gÃ©nÃ©rÃ© avec des arcs en ciel, des licornes et des Ã©tincelles pour %s le %s Ã  %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si ces ponts ne sont pas ce dont vous avez besoin, rÃ©pondez Ã  ce courriel en incluant une des commandes suivantes dans le corps du courrielÂ :"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -249,7 +231,7 @@ msgid ""
 msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider Ã  brouiller vos connexions vers le rÃ©seauÂ Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de dÃ©terminer que vous utilisez Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -261,7 +243,7 @@ msgstr "Certains ponts sont aussi proposÃ©s avec des adresses IPv6, bien que cer
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -270,134 +252,169 @@ msgid ""
 "\n"
 msgstr "De plus, BridgeDB propose de nombreux ponts traditionnels %s sans transport enfichable %s qui peuvent quand mÃªme aider Ã  contourner la censure Internet dans bien des cas.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Que sont les pontsâ???"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Les ponts%s sont des relaisÂ Tor qui vous aident Ã  contourner la censure."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Il me faut une autre faÃ§on dâ??obtenir des pontsâ??!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Une autre faÃ§on dâ??obtenir des ponts est dâ??envoyer un courriel Ã  %s. Veuillez prendre note que vous devez envoyer le courriel en utilisant une adresse provenant dâ??un des fournisseurs de courriel suivantsÂ :\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Une autre faÃ§on dâ??obtenir des ponts est dâ??envoyer un courriel Ã  %s. Laissez lâ??objet du courriel vide et Ã©crivez Â«Â get transport obfs4Â Â» dans le corps du courriel. Veuillez notez que vous devez envoyer le courriel Ã  partir dâ??une adresse qui provient dâ??un des fournisseurs de courriel suivantsÂ : %s ou %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mes ponts ne fonctionnent pas, jâ??ai besoin dâ??aideâ??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel Ã  %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Essayez dâ??inclure autant de renseignements sur votre cas que possible, incluant la liste de ponts et de transports enfichables que vous avez essayÃ© dâ??utiliser, votre version du NavigateurÂ Tor et tout message donnÃ© par Tor, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si votre NavigateurÂ Tor ne peut pas se connecter, veuillez consulter le %s et notre %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Voici vos lignes de pontsâ??:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Obtenez des pontsâ??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "MÃ©canismes de distribution des ponts"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 met en Å?uvre quatre mÃ©canismes de distribution de ponts.Â : Â«Â HTTPSÂ Â», Â«Â MoatÂ Â», Â«Â CourrielÂ Â» et Â«Â RÃ©servÃ©sÂ Â». Les ponts qui ne sont pas distribuÃ©s par BridgeDB utilisent le pseudo mÃ©canisme Â«Â AucunÂ Â». La liste suivante explique briÃ¨vement le fonctionnement de ces mÃ©canismes. Nos %smesures BridgeDB%s affiche la popularitÃ© de chaque mÃ©canisme."
+
+#: bridgedb/strings.py:115
+#, 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 "Le mÃ©canisme de distribution Â«Â HTTPSÂ Â» distribue des ponts Ã  partir de ce site Web. Afin dâ??obtenir des ponts, accÃ©dez Ã  %shttps://bridges.torproject.org/?lang=fr%s, sÃ©lectionnez les options qui vous conviennent et rÃ©solvez le captcha."
+
+#: bridgedb/strings.py:119
+#, 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 "Le mÃ©canisme de distribution Â«Â MoatÂ Â» fait partie du NavigateurÂ Tor et permet aux utilisateurs de demander des ponts Ã  partir des prÃ©fÃ©rences du NavigateurÂ Tor. Pour obtenir des ponts, accÃ©dez aux %sparamÃ¨tres de Tor%s dans les prÃ©fÃ©rences de votre Navigateur Tor, cliquez sur Â«Â Demander un nouveau pontÂ Â», rÃ©solvez le captcha et le NavigateurÂ Tor ajoutera automatiquement vos nouveaux ponts."
+
+#: bridgedb/strings.py:125
+#, 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 "Les utilisateurs peuvent demander des ponts au mÃ©canisme de distribution Â«Â CourrielÂ Â» en envoyant un courriel Ã  %sbridges@xxxxxxxxxxxxxx%s et en Ã©crivant Â«Â get transport obfs4Â Â» dans le corps du courriel."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "RÃ©servÃ©s"
+
+#: bridgedb/strings.py:130
+#, 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 administre un petit nombre de ponts qui ne sont pas distribuÃ©s automatiquement. Nous rÃ©servons plutÃ´t ces ponts pour une distribution manuelle aux ONG et autres organismes, mais aussi aux personnes qui ont besoin de ponts. Les ponts distribuÃ©s par le mÃ©canisme Â«Â RÃ©servÃ©sÂ Â» pourraient nâ??Ãªtre utilisÃ©s par aucun utilisateur pendant longtemps. Notez que le mÃ©canisme de distribution Â«Â RÃ©servÃ©sÂ Â» est appelÃ© Â«Â Non attribuÃ©sÂ Â» dans les fichiers dâ??%sattribution de la rÃ©serve de ponts%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Aucune"
+
+#: bridgedb/strings.py:138
+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 "Les ponts dont le mÃ©canisme de distribution est Â«Â AucunÂ Â» ne sont pas distribuÃ©s par BridgeDB. La distribution de ces ponts aux utilisateurs est la responsabilitÃ© de lâ??opÃ©rateur du pont. Notez que lors dâ??une Recherche de relais, le mÃ©canisme de distribution dâ??un pont qui vient juste dâ??Ãªtre mis en place indique Â«Â AucunÂ Â» pendant environ une journÃ©e. Veuillez faire preuve de patience, il affichera bientÃ´t le bon mÃ©canisme de distribution de ponts.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Veuillez choisir des options pour le type de pontsâ??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Avez-vous besoin dâ??adresses IPv6â???"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Votre navigateur nâ??affiche pas les images correctement."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
-msgstr "Saisir les caractÃ¨res de lâ??image ci-dessusâ?¦"
+msgstr "Saisissez les caractÃ¨res de lâ??image ci-dessusâ?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Comment commencer Ã  utiliser vos pontsâ???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Pour 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Vous devez dâ??abord %stÃ©lÃ©charger le NavigateurÂ Tor%s. Notre guide dâ??utilisation du NavigateurÂ Tor explique comment ajouter vos ponts dans le NavigateurÂ Tor. Si vous utilisez Windows, Linux ou macOS, %scliquez ici%s pour plus de prÃ©cisions. Si vous utilisez Android, %scliquez ici%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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Â :"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Ajoutez ces ponts Ã  votre NavigateurÂ Tor en accÃ©dant aux prÃ©fÃ©rences de votre navigateur, en cliquant sur Â«Â TorÂ Â», puis en les ajoutant dans le champ Â«Â Fournir un pontÂ Â»."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Votre fournisseur dâ??accÃ¨s Ã  Internet (FAI) bloque-t-il ou censure-t-il vos connexions au rÃ©seauÂ Torâ???"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Demander des pontsÂ Tor non brouillÃ©s.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "SÃ©lectionnez Â«Â OuiÂ Â» et cliquez ensuite sur Â«Â SuivantÂ Â». Pour configurer vos nouveaux ponts, copiez et collez les lignes de ponts dans la boÃ®te de saisie de texte. Enfin, cliquez sur Â«Â Se connecterÂ Â» et vous devriez avoir finiâ??! Si vous Ã©prouvez des problÃ¨mes, cliquez sur le bouton Â«Â AideÂ Â» dans lâ??assistant des Â«Â ParamÃ¨tres du rÃ©seauÂ TorÂ Â» pour un soutien supplÃ©mentaire."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Affiche ce message."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Demander des ponts traditionnels."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Demander des ponts IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demander un transport enfichable par TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Demander des pontsÂ IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtenir une copie de la clÃ© GnuPG publique de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Demander des ponts brouillÃ©s obfs4.)"
diff --git a/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
index ac4cdd8..2f46d55 100644
--- a/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
@@ -1,123 +1,138 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Kevin Scannell <kscanne@xxxxxxxxx>, 2017
+# Kevin Scannell <kscanne@xxxxxxxxx>, 2017,2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-10-07 19:53+0000\n"
-"Last-Translator: Kevin Scannell <kscanne@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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Ãº."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Teanga"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Tuairiscigh Fabht"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³d Foinseach"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Logchomhad athruithe"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "TeagmhÃ¡il"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Roghnaigh Uile"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "TaispeÃ¡in CÃ³d QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Do chuid lÃnte droichid mar chÃ³d QR"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "OchÃ³n Ã³!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "DealraÃonn sÃ© gur tharla earrÃ¡id agus do chÃ³d QR Ã¡ fhÃ¡il."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "TÃ¡ do chuid lÃnte droichid laistigh den chÃ³d QR seo. Is fÃ©idir Ã© a scanadh le lÃ©itheoir QR chun na lÃnte droichid a chÃ³ipeÃ¡il go dtÃ fÃ³n pÃ³ca nÃ³ glÃ©asanna soghluaiste eile."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "NÃl aon droichead ar fÃ¡il faoi lÃ¡thair..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "B'fhÃ©idir gur chÃ³ir duit %s dul siar %s agus cineÃ¡l difriÃºil droichid a roghnÃº!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "CÃ©im %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ã?oslÃ³dÃ¡il %s BrabhsÃ¡laÃ Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "CÃ©im %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Faigh %s droichid %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "CÃ©im %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Anois %s cuir na droichid le BrabhsÃ¡laÃ Tor %s"
@@ -126,27 +141,27 @@ msgstr "Anois %s cuir na droichid le BrabhsÃ¡laÃ Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sN%sÃ theastaÃonn uaim ach droichid!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ardroghanna"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃl"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "dada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sÃ¡!"
@@ -154,69 +169,37 @@ msgstr "%sT%sÃ¡!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sF%saigh Droichid"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Is teachtaireacht uathoibrÃoch Ã© seo; nÃ¡ tabhair freagra.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Seo do chuid droichead:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "ShÃ¡raigh tÃº an teorainn rÃ¡ta. TÃ³g go bog Ã©! Is Ã© %s uair an chloig an trÃ©imhse is lÃº a cheadaÃtear idir rÃomhphoist. DÃ©anfar neamhaird de aon teachtaireacht eile le linn na trÃ©imhse seo."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ORDUITHE: (ÃºsÃ¡id na hORDUITHE seo chun nÃos mÃ³ nÃ¡ rogha amhÃ¡in a shocrÃº san am cÃ©anna)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "FÃ¡ilte go BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "CINEÃ?LACHA iompair a dtacaÃtear leo faoi lÃ¡thair:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "HÃ³ra a %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Dia dhuit a chara!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Eochracha PoiblÃ"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "LeipreachÃ¡in a scrÃobh an rÃomhphost seo\nle haghaidh %s ar %s ag %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,7 @@ msgid ""
 msgstr "SolÃ¡thraÃonn BridgeDB droichid a ÃºsÃ¡ideann %scineÃ¡lacha Ã©agsÃºla Iompair IonphlugÃ¡ilte%s, a cheileann do cheangal le LÃonra Tor, sa chaoi go mbeidh sÃ© nÃos deacra d'Ã©inne atÃ¡ ag faire ar do thrÃ¡cht IdirlÃn dÃ©anamh amach go bhfuil tÃº ag ÃºsÃ¡id Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,7 @@ msgstr "TÃ¡ roinnt droichead a ÃºsÃ¡ideann seoltaÃ IPv6 ar fÃ¡il, cÃ© nach bhfu
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ msgid ""
 "\n"
 msgstr "TÃ¡ go leor gnÃ¡thdhroichead ar fÃ¡il mar chuid de BridgeDB freisin, droichid %s nach mbaineann ÃºsÃ¡id as cÃ³rais iompair ionphlugÃ¡ilte %s. B'fhÃ©idir nach bhfuil siad chomh spÃ©isiÃºil sin, ach cabhraÃonn siad leat cinsireacht IdirlÃn a sheachaint mar sin fÃ©in.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Cad is droichead ann?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "Is Ã©ard atÃ¡ i %snDroichead%s nÃ¡ athsheachadÃ¡n Tor a chabhraÃonn leat cinsireacht a sheachaint."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "TeastaÃonn uaim bealach malartach le droichid a fhÃ¡il!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Is fÃ©idir droichid a fhÃ¡il freisin trÃ rÃomhphost a sheoladh chuig %s. Caithfidh tÃº an teachtaireacht a sheoladh Ã³ cheann de na solÃ¡thraithe rÃomhphoist seo a leanas:\n%s, %s nÃ³ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "NÃl mo chuid droichead ag obair! TÃ¡ cÃºnamh uaim!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mura bhfuil Tor ag obair duit, seol rÃomhphost chuig %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "DÃ©an iarracht an mÃ©id is mÃ³ eolais agus is fÃ©idir a sholÃ¡thar: na droichid agus na cÃ³rais iompair ionphlugÃ¡ilte a d'ÃºsÃ¡id tÃº, an leagan de do bhrabhsÃ¡laÃ Tor, teachtaireachtaÃ a chuir Tor amach, srl."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Seo do chuid lÃnte droichid:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Faigh Droichid!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Roghanna don chineÃ¡l droichid:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "An dteastaÃonn seoltaÃ IPv6 uait?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "An dteastaÃonn %s uait?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "NÃl do bhrabhsÃ¡laÃ ag taispeÃ¡int ÃomhÃ¡nna mar is ceart."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Cuir isteach na carachtair Ã³n ÃomhÃ¡ thuas..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Conas do chuid droichead a ÃºsÃ¡id"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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Ãº."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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Ã©:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "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?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Roghnaigh 'TÃ¡' ansin cliceÃ¡il 'Ar Aghaidh'. Chun na droichid nua a chumrÃº, cÃ³ipeÃ¡il agus greamaigh na lÃnte droichid isteach sa mbosca ionchurtha. Ansin, cliceÃ¡il 'Ceangail' agus beidh gach uile rud rÃ©idh! MÃ¡ tharlaÃonn aon fhadhb, cliceÃ¡il an cnaipe 'Cabhair' sa treoraÃ 'Socruithe LÃonra Tor' chun tuilleadh eolais a fhÃ¡il."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "TaispeÃ¡nann sÃ© an teachtaireacht seo."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Iarr gnÃ¡thdhroichid."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Iarr droichid IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Iarr CÃ³ras Iompair IonphlugÃ¡ilte de rÃ©ir a CHINEÃ?L."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Faigh cÃ³ip den eochair phoiblÃ GnuPG a ÃºsÃ¡ideann BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..b074171
--- /dev/null
+++ b/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Mairi Macleod <mairi_mac9@xxxxxxxxxxx>, 2016,2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: gd\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Innis mu mhearachd"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "CÃ²d TÃ¹sail"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Clar-atharraich"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tagh e uile"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Seall CÃ²d-QR"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "CÃ²d-QR airson do loidhnichean-drochaid"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do ChÃ²d-QR."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tha na loidhnichean drochaid agad sa ChÃ²d QR seo. Sganaich an cÃ²d leis an leughadair QR agad gus lethbhreac fhaighinn air na h-innealan eile a th' agad."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "'S dÃ²cha gum bu chÃ²ir dhut %s dol air ais %s fheuchainn agus drochaid eadar-dhealaichte a thaghadh!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ceum %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Luchdaich a-nuas %s Brabhsair Tor %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ceum %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Faigh %s drochaidean %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ceum %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sheir dhomh drochaidean!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Roghainnean adhartach"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Chan eil"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Chan eil gin"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sha!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sF%saigh Drochaidean"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Seo do dhrochaidean:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Rach thu thairis air na 's urrainn dhut a dhÃ¨anamh san Ã¹ine. 'S e %s uair an Ã¹ine as giorra a dh'fheumas tu fireachd eadar puist-dealain. Bidh gach post-dealan eadar an Ã¹ine air fhÃ gail ron ath uair air an leigeil seachad."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "'S urrainn BridgeDB drochaidean le %s dÃ²ighean siubhail a tha Pluggable %s a sholarachadh,\nagus cuidichidh iad seo thu a' doilleireachadh na ceanglaichean agad ris an lÃ¬onraich Tor,\nga dhÃ¨anamh nas\ndoirbhe do dhuine sam bith a tha a' coimhead air do thrafaig eadar-liona a tha a' feuchainn ri dearbhadh\n gu bheil thu\na' cleachdadh Tor.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Tha feadhainn de dhrochaidean le seÃ²laidhean IPv6 ri fhaotainn, ged nach eil feadhainn de na dÃ²ighean siubhail Pluggable\nfreagarrach airson IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "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:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "De a th' ann an drochaidean?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "'S e turais pÃ irteach Tor a th' anns na %s Drochaidean %s a bhitheas a' faighinn seachadh air oirdhirpean oifigeil gus casg a chur air beachdan mi-iomchaidh a sgaoileadh."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Tha feum agam air dÃ²igh eile drochaidean fhaighinn!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Seo do loidhnichean-drochaid:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Faigh Drochaidean!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "A bheil feum agad air seolaidhean-IPv6?"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "A bheil feum agad air seÃ²laidhean IPv6?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Am feum thu %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dÃ²igh cheart."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "SgrÃ¬obh a-steach na caractaran bhon Ã¬omhaigh gu h-Ã irde..."
+
+#: bridgedb/strings.py:159
+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:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
index 6d5e9ac..5fd3596 100644
--- a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Eu <luz.armas@xxxxxx>, 2014
@@ -12,116 +12,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-06 11:07+0000\n"
-"Last-Translator: Oscar Guardiola <Oscar.Guardiola@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "SentÃmolo! Algo foi mal coa sÃºa solicitude."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Informar dun Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Rexistro de Cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Amosar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as sÃºas liÃ±as ponte"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ups!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Semella que houbo un erro obtendo o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©n as sÃºas liÃ±as ponte. EscanÃ©eo cun lector de cÃ³digos QR para copiar as sÃºas liÃ±as ponte nun mÃ³bil e outros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Non hai pontes dispoÃ±ibles agora mesmo..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Quizais deberÃa tentar %s indo hacia atrÃ¡s %s i elexindo un tipo de ponte diferente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar %s Tor Bowser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter as %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora %s engada as pontes ao Tor Browser %s"
@@ -130,27 +145,27 @@ msgstr "Agora %s engada as pontes ao Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sÃ³amente dame pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpciÃ³ns Avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ningÃºn"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%si!"
@@ -158,69 +173,37 @@ msgstr "%sS%si!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta Ã© unha mensaxe automÃ¡tica; por favor non responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Estes son os seus bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Excedeu o lÃmite de taxa. Por favor vaia a modo! O tempo mÃnimo entre correos electrÃ³nicos Ã© %s horas. Todos os novos correos electrÃ³nicos durante este perÃodo de tempo serÃ¡n ignorados."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOs: (combinar COMANDOs para especificar mÃºltiples opciÃ³ns simultÃ¡neamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "DÃ¡moslle a benvida a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ola, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ola amigo/a!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves pÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este email foi xenerado con arcos da vella, unicornios, e faÃscas\npara %s en %s Ã¡s %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,7 +214,7 @@ msgid ""
 msgstr "BridgeDB pode proporcionar pontes con distintos %stipos de Transportes Enchufables%s,\nque poden axudar a ofuscar a sÃºas conexiÃ³ns Ã¡ Rede Tor, facendo mÃ¡is\ndifÃcil para calquera que vixÃe o seu trÃ¡fico de internet determinar se vostede estÃ¡\nempregando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -243,7 +226,7 @@ msgstr "TamÃ©n estÃ¡n dispoÃ±ibles algunhas pontes con direcciÃ³ns IPv6, aÃnda
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -252,134 +235,169 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB ten unha morea de pontes tradicionais de toda a vida %s sen ningÃºn\nTransporte Enchufable %s o que non pode sonar molÃ³n, pero todavÃa\naxudan a evitar a censura de internet en moitos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Que son os repetidores ponte?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Pontes %s son retransmisores Tor que lle axudan a evitar a censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Eu necesito un xeito alternativo de obter pontes!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outro xeito de obter pontes e enviando un email a %s. Por favor teÃ±a en conta que debe\nenviar o email empregando unha direcciÃ³n dende un dos seguintes proveedores de email:\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "As miÃ±as pontes non funcionan! Necesito axuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir tanta informaciÃ³n como poida acerca do seu caso, incluindo a lista de\npontes de Transportes Enchufables que tentou usar, a sÃºa versiÃ³n do Tor Browser,\ne calquera mensaxes que Tor dera, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Estas son as sÃºas liÃ±as ponte:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Nada"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccione opciÃ³ns para o tipo de ponte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Necesita direcciÃ³ns IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necesita vostede un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador non estÃ¡ amosando imaxes adecuadamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Introduza os caracteres da imaxen de enrriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar as sÃºas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para introducir 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "O seu Porveedor de Servicios de Internet (ISP) bloquea ou censura conexiÃ³ns\nÃ¡ rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccione 'Si' e prema en 'Seguinte'. Para configurar as sÃºas novas pontes, copie e\npegue as liÃ±as ponte na caixa de entrada de texto. Finalmente, prema 'Conectar', e\ndeberÃa poder comenzar! Se ten algÃºn problema, intente premendo o botÃ³n\n'Axuda' no asistente de 'Axustes de Rede de Tor' para axuda adicional."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Amosa esta mensaxe."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicitar pontes estÃ¡ndar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar pontes IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Transporte Enchufable por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obter unha copia da clave pÃºblica GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..6957187
--- /dev/null
+++ b/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Drashti Pandya <drashtipandya37@xxxxxxxxx>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "àª®àª¾àª« àª?àª°àª¶à«?! àª¤àª®àª¾àª°à«? àªµàª¿àª¨àª?àª¤à«? àª¸àª¾àª¥à«? àª?àª?àª?àª? àª?à«?àª?à«?àª? àª¥àª¯à«?àª?."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "àª¸àª®àª¸à«?àª¯àª¾àª¨à«? àª?àª¾àª£ àª?àª°à«?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "àª¸à«?àª¤à«?àª°à«?àª¤ àª?à«?àª¡"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "àª¨à«?àª?àª§àª£à«?àª? àª¬àª¦àª²à«?"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "àª¬àª§à«? àªªàª¸àª?àª¦ àª?àª°à«?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRCode àª¬àª¤àª¾àªµà«?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "àª¤àª®àª¾àª°à«? bridge àª²àª¾àª?àª¨à«?àª¸ àª®àª¾àª?à«? QRCode"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "àª?àªµà«?àª? àª²àª¾àª?à«? àª?à«? àª?à«? àª¤àª®àª¾àª°à«?àª? QRCode àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àªà«?àª² àª?àªµà«? àª¹àª¤à«?."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "àª¹àª¾àª²àª®àª¾àª? àª?à«?àª? bridges àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "àªªàª?àª²à«?àª? %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°à«? %s Tor Browser %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "àªªàª?àª²à«?àª? %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "àª?àª¦à«?àª¯àª¤àª¨ àªµàª¿àª?àª²à«?àªªà«?"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "àª¨àª¹àª¿"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "àª?àª?àª? àª¨àª¹à«?àª?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sàª¹àª¾%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sàª®à«?%sàª³àªµà«? Bridges"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "àª?àª¹à«?àª? àª¤àª®àª¾àª°àª¾ bridges àª?à«?:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr ""
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "àª®àª¨à«? bridges àª®à«?àª³àªµàªµàª¾àª¨à«? àªµà«?àª?àª²à«?àªªàª¿àª? àª°àª¸à«?àª¤à«? àª?à«?àª?àª? àª?à«?!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "bridges àª®à«?àª³àªµà«?!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "àª?àª?à«? àª¨àª¹àª¿"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
index 6419a0b..d3bb8e2 100644
--- a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
@@ -1,13 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # aharon, 2012
 # Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
 # Dvir Rosen <ndvnis@xxxxxxxxx>, 2014
 # GenghisKhan <genghiskhan@xxxxxx>, 2013,2015
-# ION, 2017-2018
+# ION, 2017-2020
 # Johnny Diralenzo, 2015
 # Kunda, 2014
 # Kunda, 2015
@@ -18,116 +18,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-10-17 12:25+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 19:44+0000\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "×¡×?×?×?×?! ×?×©×?×? ×?×©×ª×?×© ×?×?×§×©×? ×©×?×?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "×©×¤×?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "×?×?×?×? ×¢×? ×ª×§×?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "×§×?×? ×?×§×?×¨"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "×?×?×?×? ×©×?× ×?×?×?×?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "×¦×?×¨ ×§×©×¨"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "×?×?×¨ ×?×?×?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "×?×¦×? ×§×?×? QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "×§×?×? QR ×?×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "×?×?×? ×?×?×?×?×?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "× ×¨×?×? ×©× ×¤×?×? ×?×¢×?×ª ×?×§×?×?×ª ×§×?×? ×?-QR ×©×?×?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "×§×?×? QR ×?×? ×?×?×?×? ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?. ×¡×¨×?×§ ×?×?×ª×? ×?×?×?×¦×¢×?×ª ×§×?×¨×? ×§×?×? QR ×¢×? ×?× ×ª ×?×?×¢×ª×?×§ ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×? ×?×?×?×¤×?×? × ×?×?×? ×?×?×?×©×?×¨×?×? ×?×?×¨×?×?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB × ×ª×§×? ×?×©×?×?×?×?."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
-msgstr "×?×?×? ×?×¨×?×¢ ×?×©×¨×?×? ×?×?×?× ×?×? ×?×?×©×?×?..."
+msgstr "×?×?×? ×?×¨×?×¢ ×?×©×¨×?×? ×?×?×?× ×?×? ×?×?×©×?×?â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "× ×¡×? ×?×?×?×?×¨ %s ×?×?×?×?×¨ %s ×?×?×?×?×?×¨ ×?×©×¨ ×?×¡×?×? ×?×?×¨!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "×©×?×? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "×?×?×¨×? ×?×ª %s ×?×¤×?×¤×? Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "×©×?×? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "×?×©×? %s ×?×©×¨×?×? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "×©×?×? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
@@ -136,27 +151,27 @@ msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s×¨%s×§ ×ª×? ×?×? ×?×©×¨×?×?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "×?×¤×©×¨×?×?×?×ª ×?×ª×§×?×?×?×ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "×?×?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "×?×£ ×?×?×?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s×?%s×?!"
@@ -164,69 +179,37 @@ msgstr "%s×?%s×?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s×§%s×?×? ×?×©×¨×?×?"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[×?×?×?×? ×?×?×?×¢×? ×?×?×?×?×?×?×?×ª; × ×? ×?×? ×?×?×©×?×?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[×?×?×? ×?×?×?×´×? ×?×?×?×?×?×?×?.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "×?× ×? ×?×?×©×¨×?×? ×©×?×?:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "×?×¨×?×ª ×?×?×?×?×?×ª ×?×§×¦×?. ×?× ×? ×?×?×?! ×?×?×?×? ×?×?×?×¢×¨×? ×?×?×? ×?×?×?×´×?×?×? ×?×?×? %s ×©×¢×?×ª. ×?×? ×?×?×?×?×´×?×?×? ×?× ×?×¡×¤×?×? ×?×?×?×?×? ×¤×¨×§ ×?×?×? ×?×? ×?×?×ª×§×?×? ×?×?×ª×¢×?×?×?×ª."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "×¤×§×?×?×?×ª: (×©×?×? ×¤×§×?×?×?×ª ×?×?×? ×?×¦×?×?×? ×?×¤×©×¨×?×?×?×ª ×?×¨×?×?×?×ª ×?×?Ö¾×?×?× ×?×ª)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "×?×¨×?×? ×?×?×? ×?×? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "transport TYPEs ×?× ×ª×?×?×?×? ×?×¨×?×¢:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "×?×?×?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "×©×?×?×?, ×?×?×¨!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "×?×¤×ª×?×?×ª ×¦×?×?×?×¨×?×?×?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "×?×?×?\"×? ×?×? × ×?×¦×¨ ×¢×? ×§×©×ª×?×ª ×?×¢× ×?, ×?×?×?Ö¾×§×¨×? ×?× ×¦× ×¦×?×?\n×¢×?×?×¨ %s ×?×ª×?×¨×?×? %s ×?×©×¢×? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "×?×? ×?×©×¨×?×? ×?×?×? ×?×?× ×? ×?×? ×©×?×ª×? ×¦×¨×?×?, ×?×©×? ×?×? ×?×?×?×´×? ×?×? ×¢×? ×?×?×ª\n×?×?×¤×§×?×?×?×ª ×?×?×?×?×ª ×?×?×?×£ ×?×?×?×?×¢×?:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,158 +217,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB ×?×?×?×? ×?×¡×¤×§ ×?×©×¨×?×? ×¢×? ×?×¡×¤×¨ ×¡×?×?×?×? ×©×? %s×?×¡×?×?×? ×ª×¢×?×?×¨×?%s, ×?×?×¡×?×?×¢×?×? ×?×?×©×?×© ×?×ª ×¢×§×?×?×ª ×?×ª×?×?×¨×?×ª×? ×?×¨×©×ª Tor ×?×?×?×? ×?×§×©×?×? ×¢×? ×?×?×¨×?×?×? ×?×?×¤×§×?×?×? ×¢×? ×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×?×?×?×? ×?×?×? ×©×?×ª×? ×¢×?×©×? ×©×?×?×?×© ×?-Tor.\n"
+msgstr "BridgeDB ×?×?×?×? ×?×¡×¤×§ ×?×©×¨×?×? ×¢×? ×?×¡×¤×¨ ×¡×?×?×?×? ×©×? %s×?×¡×?×?×? ×ª×¢×?×?×¨×?%s, ×?×?×¡×?×?×¢×?×? ×?×?×?×¤×?×? ×?×ª ×¢×§×?×?×ª ×?×ª×?×?×¨×?×ª×? ×?×¨×©×ª Tor ×?×?×?×? ×?×§×©×?×? ×¢×? ×?×?×¨×?×?×? ×?×?×¤×§×?×?×? ×¢×? ×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×?×?×?×? ×?×?×? ×©×?×ª×? ×¢×?×©×? ×©×?×?×?×© ×?Ö¾Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "×?×¡×¤×¨ ×?×©×¨×?×? ×¢×? ×?×ª×?×?×?×ª IPv6 ×?×?×?× ×?×? ×?×? ×?×?, ×?×¢\"×¤ ×©×?×¡×¤×¨ ×ª×¢×?×?×¨×?×ª × ×ª×?×§×?×ª ×?×?× ×? ×ª×?×?×?×?×ª IPv6.\n"
+msgstr "×?×¡×¤×¨ ×?×©×¨×?×? ×¢×? ×?×ª×?×?×?×ª IPv6 ×?×?×?× ×?×? ×?×? ×?×?, ×?×¢×´×¤ ×©×?×¡×¤×¨ ×ª×¢×?×?×¨×?×ª × ×ª×?×§×?×ª ×?×?× ×? ×ª×?×?×?×?×ª IPv6.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "×?× ×?×¡×£, ×?-BridgeDB ×?×© ×©×¤×¢ ×©×? ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×? ×?×?×?×?×? %s ×?×?×? ×?×¡×?×?×? ×ª×¢×?×?×¨×? ×?×?×©×?×? %s, ×?×? ×©×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?×¨ ×?×¢×§×?×£ ×¦× ×?×?×¨×ª ×?×?× ×?×¨× ×? ×?×?×§×¨×?×? ×¨×?×?×?.\n"
+msgstr "×?× ×?×¡×£, ×?Ö¾BridgeDB ×?×© ×©×¤×¢ ×©×? ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×? ×?×?×?×?×? %s ×?×?×? ×ª×¢×?×?×¨×?×ª × ×ª×?×§×?×ª ×?×?×©×?×? %s, ×?×? ×©×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?×¨ ×?×¢×§×?×£ ×¦× ×?×?×¨×ª ×?×?× ×?×¨× ×? ×?×?×§×¨×?×? ×¨×?×?×?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "×?×?×? ×?×©×¨×?×??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s ×?×©×¨×?×? %s ×?×? ×?×?×¡×¨×? Tor ×?×¢×?×?×¨×?×? ×?×? ×?×¢×§×?×£ ×¦× ×?×?×¨×?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "×?× ×? ×¦×¨×?×? ×?×¨×? ×?×?×?×¤×?×ª ×?×§×?×?×ª ×?×©×¨×?×?!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "×?×¨×? × ×?×¡×¤×ª ×?×?×©×?×? ×?×©×¨×?×? ×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s. ×?× ×? ×©×?×? ×?×? ×©×?×ª×? ×?×?×?×? ×?×©×?×?×? ×?×ª ×?×?×?×?×´×? ×¢\"×? ×©×?×?×?×© ×?×?×?×? ×?×¡×¤×§×? ×?×?×?×?\"×? ×?×?×?×?×?:\n%s, %s ×?×? %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "×?×¨×? ×?×?×¨×ª ×?×?×©×?×? ×?×©×¨×?×? ×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×? %s. ×?×©×?×¨ ×?×ª × ×?×©×? ×?×?×?×?×´×? ×¨×?×§ ×?×?×ª×?×? \"get transport obfs4\" ×?×?×?×£ ×?×?×?×?×¢×? ×©×? ×?×?×?×?×´×?. ×?× ×? ×©×?×? ×?×? ×©×?×ª×? ×?×?×?×? ×?×©×?×?×? ×?×ª ×?×?×?×?×´×? ×¢×? ×?×?×? ×©×?×?×?×© ×?×?×ª×?×?×ª ×?×?×?×? ×¡×¤×§×? ×?×?×?×?×´×?×?×? ×?×?×?×?×?: %s ×?×? %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×¦×¨×?×? ×¢×?×¨×?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "×?×? Tor ×?×? ×¢×?×?×?, ×¢×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "× ×¡×? ×?×?×?×?×? ×?×?×? ×©×?×?×ª×¨ ×¤×¨×?×?×? ×¢×? ×?×?×§×¨×? ×©×?×? ×?×?×? ×?×?×?×?×ª×?, ×?×¨×?×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×?×?×¡×?×?×? ×?×ª×¢×?×?×¨×? ×?×?×ª×? × ×?×¡×?×ª, ×?×¨×¡×ª ×?×¤×?×¤×? Tor ×©×?×¨×©×?×ª×?, ×?×? ×?×?×?×¢×? ×?×ª×?×?×? ×©×?×ª×§×?×?×? ×?-Tor ×?×?×?×¡ ×?×?×¢×?×? ×?×?×? ×¤×¨×? × ×?×¡×£ ×©×¨×?×?×?× ×?×? ×?×¢×?× ×?×?."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "×?×? ×?×¤×?×¤×? Tor ×©×?×? ×?×?× ×? ×?×?×?×? ×?×?×ª×?×?×¨, ×?× ×? ×?×¢×£ ×?×?×? ×¢×? %s ×?×¢×? %s ×©×?× ×?."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "×?×?×?×? ×©×?×¨×?×ª ×?×?×©×¨ ×©×?×?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "×?×©×? ×?×©×¨×?×?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "×?× ×?× ×?× ×? ×?×¤×¦×ª ×?×©×¨×?×?"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 ×?×?×?×©×? ×?×¨×?×¢×? ×?× ×?× ×?× ×?×? ×?×?×¤×¦×ª ×?×©×¨×?×?: \"HTTPS\", \"Moat\",\n\"×?×?×?×´×?\", ×?\"×©×?Ö¸×?×?Ö¼×¨\".  ×?×©×¨×?×? ×©×?×?× ×? ×?×?×¤×¦×?×? ×¢×? ×?×?×? BridgeDB ×?×©×ª×?×©×?×? ×?×?× ×?× ×?×? ×?×?×?×?×?×? \"×?×?×?×?\".  ×?×¨×©×?×?×? ×?×?×?×? ×?×¡×?×?×¨×? ×?×§×¦×¨×? ×?×?×¦×? ×?× ×?× ×?× ×?×? ×?×?×? ×¢×?×?×?×?×? ×?%s×?×?×?×? BridgeDB%s ×©×?× ×? ×?×?×?×?×?×?×? ×?×?×? ×¤×?×¤×?×?×¨×? ×?×? ×?×?×? ×?×?×?× ×?× ×?× ×?×?."
+
+#: bridgedb/strings.py:115
+#, 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 "×?× ×?× ×?×? ×?×?×¤×¦×? \"HTTPS\" ×?×?×?×§ ×?×©×¨×?×? ×¢×? ×?×?×? ×?×ª×¨ ×?×?. ×?×?×? ×?×§×?×?\n×?×©×¨×?×?, ×?×? ×?×? %sbridges.torproject.org%s, ×?×?×¨ ×?×ª ×?×?×¤×©×¨×?×?×?×ª ×?×?×?×¢×?×¤×?×ª ×¢×?×?×?,\n×?×¤×ª×?×¨ CAPTCHA ×©×?×?×?×¨ ×?×?×?."
+
+#: bridgedb/strings.py:119
+#, 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 "×?× ×?× ×?×? ×?×?×¤×¦×? \"Moat\" ×?×?×? ×?×?×§ ×?×?×¤×?×¤×? Tor, ×?×? ×©×?×ª×?×¨ ×?×?×©×ª×?×©×?×?\n×?×?×§×© ×?×©×¨×?×? ×?×ª×?×? ×?×?×?×¨×?×ª ×?×¤×?×¤×? Tor.  ×?×?×? ×?×§×?×? ×?×©×¨×?×?, ×?×? ×?×?\n%s×?×?×?×¨×?×ª Tor%s ×©×? ×?×¤×?×¤×? Tor ×©×?×?, ×?×?×¥ ×¢×? \"×?×§×© ×?×©×¨ ×?×?×©\", ×¤×ª×?×¨\nCAPTCHA ×©×?×?×?×¨ ×?×?×?, ×?×?×¤×?×¤×? Tor ×?×?×¡×?×£ ×?×?×?×¤×? ×?×?×?×?×?×?×? ×?×ª ×?×?×©×¨×?×?\n×?×?×?×©×?×? ×©×?×?."
+
+#: bridgedb/strings.py:125
+#, 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 "×?×©×ª×?×©×?×? ×?×?×?×?×?×? ×?×?×§×© ×?×©×¨×?×? ×?×?× ×?× ×?×? ×?×?×¤×¦×? \"×?×?×?×´×?\" ×¢×? ×?×?×? ×©×?×?×?×ª\n×?×?×?×´×? ×?×? %sbridges@xxxxxxxxxxxxxx%s ×?×?×ª×?×?×ª \"get transport obfs4\" ×?×?×?×£ ×?×?×?×?×´×?."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "×©×?Ö¸×?×?Ö¼×¨"
+
+#: bridgedb/strings.py:130
+#, 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 ×?×ª×?×?×§ ×?×¡×¤×¨ ×§×?×? ×©×? ×?×©×¨×?×? ×©×?×?× ×? ×?×?×¤×¦×?×?\n×?×?×?×¤×? ×?×?×?×?×?×?×?.  ×?×?×§×?×? ×?×?×ª, ×?× ×?× ×? ×©×?×?×¨×?×? ×?×©×¨×?×? ×?×?×? ×¢×?×?×¨ ×?×¤×¦×? ×?×?× ×?×ª\n×?×?×?×?×§×?×? ×?×?×ª×? ×?×? ×?×¨×?×?× ×?×? ×?×?×ª×?Ö¾×?×?×©×?×ª×?×?×? ×?×?×¨×?×?× ×?×? ×?×?×¨×?×? ×?×?×?×?×?× ×?×?×? ×©×¦×¨×?×?×?×?\n×?×©×¨×?×?.  ×?×©×¨×?×? ×©×?×?×¦×¤×?×? ×¢×? ×?×?×? ×?× ×?× ×?×? \"×©×?Ö¸×?×?Ö¼×¨\" ×¢×©×?×?×?×? ×©×?×?\n×?×¨×?×?×ª ×?×©×ª×?×©×?×? ×?×?×©×? ×?×?×? ×¨×?.  ×©×?×? ×?×? ×©×?× ×?× ×?×? ×?×?×¤×¦×? \"×©×?Ö¸×?×?Ö¼×¨\" ×?×?×?\n× ×§×¨×? \"×?×?×ª×?Ö¾×?×?×§×¦×?\" ×?×§×?×¦×? %s×?×?×?×ª ×?×¨×?×?×? ×©×? ×?×©×¨%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "×?×?×?×?"
+
+#: bridgedb/strings.py:138
+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.\n×?×?×ª ×?×?×¨×?×?×ª ×©×? ×?×ª×¤×¢×? ×?×?×©×¨ ×?×?×¤×?×¥ ×?×ª ×?×?×©×¨×?×? ×©×?×? ×?×?×©×ª×?×©×?×?.\n×©×?×? ×?×? ×©×?×?×?×¤×?×© ×?×?×¡×¨, ×?× ×?× ×?×? ×?×¤×¦×? ×?×¨×? ×©×?×?×?×?×¨ ×©×? ×?×©×¨\n×?×?×?×¨ \"×?×?×?×?\" ×¢×? ×?×?×? ×?×?×? ×?×§×?×¨×?×?. ×?× ×? ×?×?×?×? ×¡×?×?× ×?, ×?×?×? ×?×? ×?×©×ª× ×?\n×?×? ×?× ×?× ×?×? ×?×?×¤×¦×? ×?×?×?×©×? ×©×? ×?×?×©×¨.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "×?× ×? ×?×?×¨ ×?×¤×©×¨×?×?×?×ª ×?×¡×?×? ×?×?×©×¨:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? ×?×ª×?×?×?×ª IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "×?×?×¤×?×¤×? ×©×?×? ×?×? ×?×¦×?×? ×ª×?×?× ×?×ª ×?×¨×?×?×?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
-msgstr "×?×?× ×¡ ×?×ª ×?×ª×?×?×?×? ×?×?×ª×?×?× ×? ×?×?×¢×?×?..."
+msgstr "×?×?× ×¡ ×?×ª ×?×ª×?×?×?×? ×?×?×ª×?×?× ×? ×?×?×¢×?×?â?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "×?×?×? ×?×?×ª×?×?×? ×?×?×©×ª×?×© ×?×?×©×¨×?×? ×©×?×?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "×?×?×? ×?×?×?× ×?×¡ ×?×©×¨×?×? ×?×ª×?×? ×?×¤×?×¤×? Tor, ×¨×?×©×?×ª ×?×? ×?×? %s ×?×£ ×?×?×¨×?×ª ×?×¤×?×¤×? Tor %s ×?×?×?×?×¨ ×?×?×? ×¢×§×?×? ×?×?×¨ ×?×?×?×¨×?×?×ª ×¢×?×?×¨ ×?×?×¨×?×? ×?×?×ª×?×?×? ×©×? ×?×¤×?×¤×? Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " ×ª×?×?×?×?, ×?×ª×? ×¦×¨×?×? %s×?×?×?×¨×?×? ×?×ª Tor Browser%s. ×?×?×¨×?×? ×?×©×ª×?×© Tor Browser\n ×©×?× ×? ×?×¡×?×?×¨ ×?×?×? ×?×ª×? ×?×?×¡×?×£ ×?×©×¨×?×? ×?×? Tor Browser. ×?×? ×?×ª×?\n ×?×©×ª×?×© ×?Ö¾Windows, Linux ×?×? OS X, %s×?×?×¥ ×?×?×?%s ×?×?×? ×?×?×?×?×? ×¢×?×?. ×?×? ×?×ª×?\n ×?×©×ª×?×© ×?Ö¾Android, %s×?×?×¥ ×?×?×?%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "×?×?×©×¨ ×?×?×?Ö¾×©×?×? '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¦×?×¥, ×?×?×¥ ×¢×? '×?×?×?×¨' ×?×¢×§×?×? ×?×?×¨ ×?×?×©×£ ×¢×? ×©×?×?×? ×?×©×?×?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "×?×?×¡×£ ×?×©×¨×?×? ×?×?×? ×?×? ×?×¤×?×¤×? Tor ×©×?×? ×¢×? ×?×?×? ×¤×ª×?×?×ª ×?×¢×?×¤×?×ª\n×?×?×¤×?×¤×? ×©×?×?, ×?×?×?×¦×? ×¢×? \"Tor\", ×?×?×? ×?×?×¡×¤×ª×? ×?×? ×?×©×?×? \"×¡×¤×§\n×?×©×¨\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "×?×?×? ×¡×¤×§ ×©×?×¨×?×ª×? ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×¡×? ×?×? ×?×¦× ×?×¨ ×?×?×?×?×¨×?×? ×?×? ×¨×©×ª Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(×?×§×© ×?×©×¨×? Tor ×?×?×ª×? ×?×?×?×¤×?×?×?.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "×?×?×¨ '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?×ª×¦×¨ ×?×ª ×?×?×©×¨×?×? ×?×?×?×©×?×? ×©×?×?, ×?×¢×ª×§ ×?×?×?×?×§ ×?×ª ×©×?×¨×?×ª ×?×?×©×¨×?×? ×?×ª×?×? ×ª×?×?×ª ×?×§×?×? ×©×? ×?×?×?×?. ×?×?×¡×?×£, ×?×?×¥ ×¢×? '×?×ª×?×?×¨' ×?×?×ª×? ×?×?×?×¨ ×?×?×?×?×ª ×?×?×?×?! ×?×? ×ª×?×?×?×? ×ª×§×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ '×¢×?×¨×?' ×?×?×©×£ '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¡×?×?×¢ × ×?×¡×£."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "×?×¦×?×? ×?×?×?×¢×? ×?×?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "×?×§×© ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "×?×§×© ×?×©×¨×? IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "×?×§×© ×ª×¢×?×?×¨×? × ×ª×?×§×? ×¢\"×? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(×?×§×© ×?×©×¨×? IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "×§×?×? ×¢×?×ª×§ ×©×? ×?×¤×ª×? ×?-GPG ×?×¦×?×?×?×¨×? ×©×? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(×?×§×© ×?×©×¨×? obfs4 ×?×?×?×¤×?×?×?.)"
diff --git a/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
index 912ca93..8f479b2 100644
--- a/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # A. Saad Imran, 2016
@@ -11,116 +11,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¤?à¥?à¤·à¤®à¤¾ à¤?à¤°à¥?à¤? ! à¤?à¤ªà¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤ªà¥?à¤°à¤¾ à¤¨à¤¹à¥?à¤? à¤?à¤¿à¤¯à¤¾ à¤?à¤¾ à¤¸à¤?à¤¾à¥¤ "
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¤à¤¾à¤·à¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "à¤?à¤¿à¤¸à¥? à¤¤à¥?à¤°à¥?à¤?à¥? à¤?à¥? à¤¬à¤¾à¤°à¥?à¤? à¤®à¥?à¤? à¤¬à¤¤à¤¾à¤?à¤?à¥¤ "
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "à¤¸à¤?à¤?à¥?à¤¤ à¤²à¤¿à¤ªà¤¿ à¤?à¤¾ à¤¸à¥?à¤¤à¥?à¤°à¥?à¤¤à¥¤"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨à¤¸à¥?à¤?à¥?à¥¤"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤?à¥¤"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¤¸à¤¬ à¤?à¥?à¤? à¤?à¥?à¤¨à¥?à¥¤ "
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRcode (à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡) à¤¦à¤¿à¤?à¤¾à¤?à¤?à¥¤ "
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? QRCode (à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡) à¤?à¤ªà¤?à¥? bridges lines (à¤¬à¥?à¤°à¤¿à¤? à¤²à¤¾à¤?à¤¨à¥?à¤¸) à¤?à¥? à¤²à¤¿à¤?à¥¤ "
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "à¤?à¤°à¥? à¤¨à¤¹à¥?à¤? , à¤?à¥?à¤? à¤¸à¤¹à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¤?à¤¸à¤¾ à¤²à¤? à¤°à¤¹à¤¾ à¤¹à¥? à¤?à¤ªà¤?à¥? QRCode à¤?à¥? à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤?à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¥? à¤¹à¥?à¤?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¤¯à¤¹ QRCode à¤?à¤ªà¤?à¥? bridge lines à¤°à¤?à¤¤à¤¾ à¤¹à¥?à¤?. à¤?à¤ªà¤¨à¥? bridge lines à¤?à¥? à¤®à¥?à¤¬à¤¾à¤?à¤² à¤?à¤° à¤¦à¥?à¤¸à¤°à¥? à¤?à¤ªà¤?à¤°à¤£à¥?à¤? à¤®à¥?à¤? à¤ªà¥?à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¤¸à¥? QRCode Reader à¤¸à¥? Scan à¤?à¤°à¥?à¤? ."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "à¤?à¤¸ à¤¸à¤®à¤¯ à¤?à¥?à¤? bridge à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¹à¥?à¤? à¤¹à¥?à¤? ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¤¶à¤¾à¤¯à¤¦ à¤?à¤ªà¤?à¥? %sà¤ªà¥?à¤?à¥? à¤?à¤¾à¤?à¤° %sà¤¦à¥?à¤¬à¤¾à¤°à¤¾ à¤¸à¥? à¤¦à¥?à¤¸à¤°à¤¾ bridge type à¤?à¤¾ à¤?à¤¯à¤¨ à¤?à¤°à¤¨à¥? à¤?à¥? à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¤°à¤¨à¥? à¤?à¤¾à¤¹à¤¿à¤?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¤?à¤°à¤£ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤°à¥?à¤?."
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¤?à¤°à¤£ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s bridges %s à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤? "
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¤?à¤°à¤£ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¤?à¤¬ %s bridges à¤?à¥? Tor Browser à¤¸à¥? à¤?à¥?à¥?à¥?à¤? %s"
@@ -129,27 +144,27 @@ msgstr "à¤?à¤¬ %s bridges à¤?à¥? Tor Browser à¤¸à¥? à¤?à¥?à¥?à¥?à¤? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¤?à¥?à¤µà¤²%s bridges à¤¦à¥?à¤?à¤¿à¤¯à¥? !"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¤?à¤¨à¥?à¤¨à¤¤ à¤µà¤¿à¤?à¤²à¥?à¤ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¤¨à¤¹à¥?à¤?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¤?à¥?à¤? à¤à¥? à¤¨à¤¹à¥?à¤?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¤?à¥?%s à¤¹à¤¾à¤?!"
@@ -157,69 +172,37 @@ msgstr "%sà¤?à¥?%s à¤¹à¤¾à¤?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%sridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤?."
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[à¤¯à¤¹ à¤?à¤? à¤¸à¥?à¤µà¤?à¤¾à¤²à¤¿à¤¤ à¤¸à¤¨à¥?à¤¦à¥?à¤¶ à¤¹à¥?à¤?; à¤?à¥?à¤ªà¥?à¤¯à¤¾ à¤?à¤µà¤¾à¤¬ à¤¨ à¤¦à¥?à¤?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? à¤?à¤ªà¤?à¥? bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "à¤?à¤ªà¤¨à¥? à¤?à¤µà¥?à¤¤à¤¿ à¤¦à¤° à¤?à¥? à¤¸à¥?à¤®à¤¾ à¤ªà¤¾à¤° à¤?à¤° à¤²à¥? à¤¹à¥?. à¤?à¥?à¤ªà¤¯à¤¾ à¤?à¤¤à¤¿ à¤?à¤® à¤?à¤°à¥?à¤?! \nEmails à¤?à¥? à¤¬à¥?à¤? à¤?à¤¾ à¤¨à¥?à¤¯à¥?à¤¨à¤¤à¤® à¤¸à¤®à¤¯ %s à¤?à¤?à¤?à¥? à¤¹à¥?à¤?. à¤?à¤¸ à¤¸à¤®à¤¯ à¤¸à¥?à¤®à¤¾ à¤®à¥?à¤? à¤?à¤¨à¥? à¤µà¤¾à¤²à¥? Emails à¤?à¤¨à¤¦à¥?à¤?à¥? à¤?à¤° à¤¦à¤¿à¤? à¤?à¤¾à¤¯à¥?à¤?à¥?. "
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "à¤?à¤¦à¥?à¤¶: (à¤?à¥?à¤°à¤®à¤¶à¤? à¤?à¤? à¤¸à¥? à¤?à¤§à¤¿à¤? à¤µà¤¿à¤?à¤²à¥?à¤ª à¤?à¤²à¥?à¤²à¥?à¤?à¤¿à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¤¦à¥?à¤¶à¥?à¤? à¤?à¥? à¤?à¤? à¤¸à¤¾à¤¥ à¤?à¥?à¥?à¥?à¤?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB à¤®à¥?à¤? à¤?à¤ªà¤?à¤¾ à¤¸à¥?à¤µà¤¾à¤?à¤¤ à¤¹à¥?à¤?!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "à¤µà¤°à¥?à¤¤à¤®à¤¾à¤¨ à¤®à¥?à¤? à¤¸à¤®à¤°à¥?à¤¥à¤¿à¤¤ Transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "à¤?à¤°à¥?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "à¤¨à¤®à¤¸à¥?à¤¤à¥?, à¤¦à¥?à¤¸à¥?à¤¤!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? à¤?à¥?à¤?à¤?à¥?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "à¤¯à¤¹ à¤?à¤®à¥?à¤² à¤°à¥?à¤¨à¥?à¤¬à¥?à¤µà¥?à¤¸, à¤¯à¥?à¤¨à¤¿à¤?à¥?à¤°à¥?à¤¨à¥?à¤¸ à¤?à¤° à¤¸à¥?à¤ªà¤¾à¤°à¥?à¤?à¥?à¤²à¥?à¤¸ à¤?à¥? à¤¸à¤¾à¤¥ %s à¤?à¥? à¤²à¤¿à¤? %s à¤ªà¤° %s à¤®à¥?à¤? à¤¬à¤¨à¤¾à¤¯à¤¾ à¤?à¤¯à¤¾ à¤¹à¥?."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
 msgstr "BridgeDB à¤?à¤? %s à¤ªà¥?à¤°à¤?à¤¾à¤° à¤?à¥? Pluggable Transports %s à¤ªà¥?à¤°à¤¦à¤¾à¤¨ à¤?à¤° à¤¸à¤?à¤¤à¤¾ à¤¹à¥?,\nà¤?à¥? à¤?à¤¿ Tor Network à¤?à¥? à¤¸à¤¾à¤¥ à¤?à¤ªà¤?à¥? à¤?à¤¨à¥?à¤?à¥?à¤¶à¤¨ à¤?à¥? à¤?à¤¸à¥?à¤ªà¤·à¥?à¤? à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤®à¤¦à¤¦ à¤?à¤°à¤¤à¤¾ à¤¹à¥? à¤?à¤¿à¤¸à¤¸à¥? à¤?à¤¿\nà¤?à¤ªà¤?à¥? à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤?à¥?à¤°à¥?à¤«à¤¿à¤? à¤?à¥? à¤¦à¥?à¤?à¤?à¤° à¤¯à¤¹ à¤ªà¤¤à¤¾ à¤²à¤?à¤¾à¤¨à¤¾\nà¤®à¥?à¤¶à¥?à¤?à¤¿à¤² à¤¹à¥? à¤?à¤¿ à¤?à¤ª Tor à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤° à¤°à¤¹à¥? à¤¹à¥?à¤?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,7 @@ msgstr "à¤?à¥?à¤? bridges IPv6 à¤?à¤¡à¥?à¤°à¥?à¤¸ à¤?à¥? à¤¸à¤¾à¤¥ à¤à¥? à¤?à¤ª
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
 "\n"
 msgstr "à¤?à¤¸à¤?à¥? à¤?à¤¤à¤¿à¤°à¤¿à¤?à¥?à¤¤, BridgeDB à¤?à¥? à¤ªà¤¾à¤¸ à¤?à¥?à¤? à¤¸à¤¾à¤§à¤¾à¤°à¤£ bridges %s à¤¬à¤¿à¤¨à¤¾ à¤?à¤¿à¤¨à¥?à¤¹à¥?à¤? Pluggable Transports %s\nà¤?à¥? à¤à¥? à¤¹à¥?à¤?.  à¤?à¥? à¤?à¤¿ à¤¸à¥?à¤¨à¤¨à¥? à¤®à¥?à¤? à¤?à¤¤à¤¨à¥? à¤?à¤?à¥?à¤?à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥? à¤²à¥?à¤?à¤¿à¤¨ à¤«à¤¿à¤° à¤à¥? à¤¯à¥?\nà¤?à¥?à¤? à¤®à¤¾à¤®à¤²à¥? à¤®à¥?à¤? à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥?à¤?à¤¸à¤°à¤¶à¤¿à¤ª à¤?à¥? à¤°à¥?à¤? à¤¸à¤?à¤¤à¥? à¤¹à¥?à¤?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "bridges à¤?à¥?à¤¯à¤¾ à¤¹à¥?à¤??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Tor à¤°à¤¿à¤²à¥? à¤¹à¥? à¤?à¥? à¤?à¤¿ à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤ªà¤¾à¤¬à¤¨à¥?à¤¦à¥? à¤?à¥? à¤¨à¤¾à¤?à¤¾à¤® à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤?à¤ªà¤?à¥? à¤®à¤¦à¤¦ à¤?à¤° à¤¸à¤?à¤¤à¥? à¤¹à¥?à¤?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "à¤®à¥?à¤?à¥? Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¤? à¤µà¥?à¤?à¤²à¥?à¤ªà¤¿à¤? à¤¤à¤°à¥?à¤?à¥? à¤?à¥? à¤?à¤°à¥?à¤°à¤¤ à¤¹à¥?!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¤¾ à¤?à¤¨à¥?à¤¯ à¤¤à¤°à¥?à¤?à¤¾ %s à¤?à¥? à¤?à¤? à¤?à¤®à¥?à¤² à¤à¥?à¤?à¤¨à¤¾ à¤¹à¥?à¤?. à¤?à¥?à¤ªà¤¯à¤¾ à¤§à¥?à¤¯à¤¾à¤¨ à¤¦à¥?à¤? à¤?à¤¿ à¤?à¤ªà¤?à¥? à¤¯à¤¹ \nà¤?à¤®à¥?à¤², à¤¨à¤¿à¤®à¥?à¤¨ à¤®à¥?à¤? à¤¸à¥? à¤?à¤¿à¤¸à¥? à¤?à¤¿à¤¸à¥? à¤à¥? à¤?à¤? à¤?à¤®à¥?à¤² à¤ªà¥?à¤°à¤¦à¤¾à¤¤à¤¾ à¤?à¥? à¤?à¤¡à¥?à¤°à¥?à¤¸ à¤¸à¥? à¤à¥?à¤?à¤¨à¤¾ à¤¹à¥?à¤?à¤¾:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "à¤®à¥?à¤°à¥? Bridges à¤?à¤¾à¤® à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¥? à¤¹à¥?! à¤®à¥?à¤?à¥? à¤®à¤¦à¤¦ à¤?à¤¾à¤¹à¤¿à¤?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à¤¯à¤¦à¤¿ à¤?à¤ªà¤?à¤¾ Tor à¤?à¤¾à¤® à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¤¾ à¤¹à¥? à¤¤à¥? à¤?à¤ªà¤?à¥? %s à¤ªà¤° à¤?à¤®à¥?à¤² à¤à¥?à¤?à¤¨à¤¾ à¤?à¤¾à¤¹à¤¿à¤?."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à¤?à¤ªà¤?à¥? à¤®à¤¾à¤®à¤²à¥? à¤®à¥?à¤? à¤?à¤§à¤¿à¤? à¤¸à¥? à¤?à¤§à¤¿à¤? à¤?à¤¾à¤¨à¤?à¤¾à¤°à¥? à¤¦à¥?à¤¨à¥? à¤?à¤¿ à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¥?à¤?à¤¿à¤¯à¥?, à¤?à¥?à¤¸à¥? à¤?à¤¿ à¤?à¤¨ bridges à¤?à¤° Pluggable Transports à¤?à¥? à¤¸à¥?à¤?à¥?\nà¤?à¤¿à¤¨à¥?à¤¹à¥?à¤? à¤?à¤ªà¤¨à¥? à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤°à¤¨à¥? à¤?à¥? à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¥?, à¤?à¤ªà¤?à¥? Tor Browser à¤?à¤¾ à¤¸à¤?à¤¸à¥?à¤?à¤°à¤£, \nà¤?à¤° à¤?à¤¸à¥? à¤?à¥?à¤? à¤®à¥?à¤¸à¥?à¤? à¤?à¥? Tor à¤¨à¥? à¤¦à¤¿à¤? à¤¹à¥?, à¤?à¤¦à¤¿."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? à¤?à¤ªà¤?à¥? bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¤¾à¤?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¥?à¤?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "à¤?à¥?à¤? à¤¨à¤¹à¥?à¤?"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "à¤?à¥?à¤ªà¤¯à¤¾ Bridge à¤?à¥? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤?à¤¾ à¤µà¤¿à¤?à¤²à¥?à¤ª à¤?à¥?à¤¨à¤¿à¤?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? IPv6 à¤ªà¤¤à¥?à¤? à¤?à¥? à¤?à¤°à¥?à¤°à¤¤ à¤¹à¥??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? %s à¤?à¤¾à¤¹à¤¿à¤??"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "à¤?à¤ªà¤?à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¥?à¤° à¤«à¥?à¤?à¥?à¤? à¤?à¥? à¤ à¥?à¤? à¤¸à¥? à¤ªà¥?à¤°à¤¦à¤°à¥?à¤¶à¤¿à¤¤ à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¤¾ à¤¹à¥?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "à¤?à¤ªà¤° à¤?à¥? à¤?à¤¿à¤¤à¥?à¤° à¤¸à¥? à¤?à¤?à¥?à¤·à¤° à¤¡à¤¾à¤²à¥?."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "à¤?à¤ªà¤?à¥? bridges à¤?à¥? à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤°à¤¨à¤¾ à¤?à¥?à¤¸à¥? à¤¶à¥?à¤°à¥? à¤?à¤°à¥?à¤??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor Browser à¤®à¥?à¤? bridges à¤®à¥?à¤? à¤ªà¥?à¤°à¤µà¥?à¤¶ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, à¤¸à¤¬à¤¸à¥? à¤ªà¤¹à¤²à¥? %s Tor Browser à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤ªà¥?à¤? à¤ªà¤° à¤?à¤¾à¤?à¤?\n%s à¤?à¤° à¤?à¤¸à¤?à¥? à¤¬à¤¾à¤¦ à¤µà¤¹à¤¾à¤? à¤ªà¤° Tor Browser à¤?à¥? à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤° à¤¶à¥?à¤°à¥? à¤?à¤°à¤¨à¥? à¤?à¥? à¤¨à¤¿à¤°à¥?à¤¦à¥?à¤¶à¥?à¤? à¤?à¤¾ à¤ªà¤¾à¤²à¤¨ à¤?à¤°à¥?à¤?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "à¤?à¤¬ \"Tor à¤¬à¥?à¤°à¤¾à¤?à¥?à¤° à¤¸à¥?à¤?à¤¿à¤?à¤?\" à¤?à¤¾ à¤¡à¤¾à¤¯à¤²à¥?à¤? à¤¸à¤¾à¤®à¤¨à¥? à¤?à¤¯à¥?, à¤¤à¤¬ \"configure\" à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤? à¤¤à¤¥à¤¾ à¤ªà¥?à¤°à¥? à¤ªà¥?à¤°à¤?à¥?à¤°à¤® à¤?à¤¾ à¤ªà¤¾à¤²à¤¨ à¤?à¤°à¥?à¤? à¤?à¤¬ à¤¤à¤? à¤¯à¤¹ à¤¯à¥? à¤¨à¤¹à¥?à¤? à¤ªà¥?à¤?à¥?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¤¾  à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥?à¤µà¤¾ à¤ªà¥?à¤°à¤¦à¤¾à¤¤à¤¾ (ISP)\n Tor à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥? à¤¸à¤?à¤ªà¤°à¥?à¤? à¤ªà¤° à¤ªà¤¾à¤¬à¤¨à¥?à¤¦à¥? à¤²à¤?à¤¾à¤¤à¤¾ à¤¹à¥? ?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'à¤¹à¤¾à¤?' à¤?à¥?à¤¨à¥? à¤?à¤° à¤¤à¤¬ 'à¤?à¤?à¥?' à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤?. à¤?à¤ªà¤¨à¥? à¤¨à¤? bridges à¤?à¥? configure à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¥?à¤? \nà¤?à¥? à¤?à¥?à¤ªà¥? à¤?à¤°à¤?à¥?  à¤?à¥?à¤?à¥?à¤¸à¥?à¤? à¤?à¤¨à¤ªà¥?à¤? à¤¬à¥?à¤?à¥?à¤¸à¤®à¥?à¤? à¤ªà¥?à¤¸à¥?à¤? à¤?à¤° à¤¦à¥?à¤?. à¤?à¤?à¤¤ à¤®à¥?à¤?,\"à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤?\" à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤¸à¤¬ à¤?à¥?à¤? à¤?à¤ªà¤¨à¥? à¤?à¤ª à¤¹à¥? à¤?à¤¾à¤?à¤?à¤¾. \nà¤¯à¤¦à¤¿ à¤?à¤ªà¤?à¥? à¤¸à¤¾à¤®à¤¨à¥? à¤?à¥?à¤? à¤ªà¤°à¥?à¤¶à¤¾à¤¨à¥?\nà¤?à¤¯à¥? à¤¤à¥?  à¤?à¤?à¥? à¤?à¥? à¤¸à¤¹à¤¾à¤¯à¤¤à¤¾ à¤?à¥? à¤²à¤¿à¤? Tor à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥?à¤?à¤¿à¤?à¤? à¤®à¥?à¤? \"à¤®à¤¦à¤¦\" à¤¬à¤?à¤¨ à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤° à¤¦à¥?à¤?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "à¤¯à¤¹ à¤¸à¤¨à¥?à¤¦à¥?à¤¶ à¤¦à¤¿à¤?à¤¾à¤?à¤?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "vanilla bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE à¤?à¥? à¤¦à¥?à¤µà¤¾à¤°à¤¾ Pluggable Transport à¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤?à¤°à¥?à¤?."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB à¤?à¥? à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? GnuPG à¤?à¥?à¤?à¤?à¥? à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¥?à¤?."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
index d64bb28..112d0e3 100644
--- a/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,10 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Joziah Cameron <cambergeron55@xxxxxxxxx>, 2016
+# milotype <mail@xxxxxxxxxxx>, 2020
 # Nikola Parsifal <anchorsound@xxxxxxxxx>, 2014
 # Nives Miletic <nives.miletic@xxxxxxxxx>, 2018
 # Vlado V. <vlays@xxxxxxxx>, 2015
@@ -11,145 +12,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-17 20:44+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 14:41+0000\n"
+"Last-Translator: milotype <mail@xxxxxxxxxxx>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
+msgstr "Oprosti! U tvom zahtjevu je doÅ¡lo do greÅ¡ke."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
-msgstr "Prijavite greÅ¡ku"
+msgstr "Prijavi greÅ¡ku"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Izvorni kod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Zapisnik o promjenama"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Odaberi sve"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PokaÅ¾i QR kod"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR kod za VaÅ¡e linije mostova"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "O ne, greÅ¡ka!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR kod za tvoje retke mostova"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju VaÅ¡eg QR koda."
+msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju tvog QR koda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Ovaj QR kod sadrÅ¾i VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ?aje."
+msgstr "Ovaj QR kod sadrÅ¾i tvoje retke mostova. Skeniraj ga s Ä?itaÄ?em QR koda i kopiraj retke mostova na mobilne i ostale ureÄ?aje."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB je ustanovio greÅ¡ku."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
-msgstr "Trenutno nema dostupnih mostova..."
+msgstr "TrenutaÄ?no nema dostupnih mostova â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "MoÅ¾da bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
+msgstr "Probaj se %s vratiti natrag %s i odaberi jednu drugu vrstu mosta!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Korak %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Preuzmi %s Tor Browser %s"
+msgstr "Preuzmi %s Tor preglednik %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Preuzmi %s mostove %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sad %s dodaj mostove u Tor Browser %s"
+msgstr "Sad %s dodaj mostove u Tor preglednik %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo mi daj mostove!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Napredne opcije"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niÅ¡ta"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -157,69 +173,37 @@ msgstr "%sD%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sreuzmi mostove"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ovo je automatizirana poruka; molimo ne odgovarajte na nju.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ovo je automatski generiran email.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
-msgstr "Ovo su vaÅ¡i mostovi:"
+msgstr "Ovo su tvoji mostovi:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "PreÅ¡li ste limit. Molimo usporite! Vremenski minimum izmeÄ?u emailova\nje %s sati. Svi daljnji emailovi tijekom ovog perioda Ä?e biti ignorirani."
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombinirajte COMMANDs kako bi naznaÄ?ili viÅ¡e opcija istovremeno)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "DobrodoÅ¡li u BridgeDB!"
+msgstr "PremaÅ¡io/la si ograniÄ?enje. Uspori! Minimalno vrijeme izmeÄ?u emailova\niznosi %s sata/sati. Svi daljnji emailovi u ovom razdoblju Ä?e se zanemariti."
 
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podrÅ¾ani tipovi transporta:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Bok, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Bok, prijatelju!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Javni kljuÄ?evi"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ovaj email je sastavljen od duge, jednoroga i iskrica\nza %s na %s u %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ako ovi mostovi nisu ono Å¡to trebaÅ¡, odgovori na ovaj e-mail s jednom od\nsljedeÄ?ih naredbi u sadrÅ¾aju poruke:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,10 +211,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB nudi mostove s razliÄ?itim %stipovima prikljuÄ?nih transporta%s\nkoji mogu pomoÄ?i prikriti VaÅ¡e veze s Tor mreÅ¾om, oteÅ¾avajuÄ?i onome tko\nprati VaÅ¡ Internet promet da vidi da koristite Tor.\n"
+msgstr "BridgeDB omoguÄ?uje mostove s razliÄ?itim %svrstama prikljuÄ?nih transporta%s\nkoji mogu pomoÄ?i prikriti tvoju veze s Tor mreÅ¾om, oteÅ¾avajuÄ?i onome tko\nprati tvoj internetski promet vidjeti da koristiÅ¡ Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -242,143 +226,178 @@ msgstr "TakoÄ?er su dostupni neki mostovi s IPv6 adresama, no neki prikljuÄ?ni t
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji moÅ¾da ne zvuÄ?e prezanimljivo, ali mogu\npomoÄ?i zaobiÄ?i Internet cenzuru u mnogo sluÄ?ajeva.\n"
+msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji moÅ¾da ne zvuÄ?e najbolje, ali Ä?esto mogu\npomoÄ?i zaobiÄ?i internetsku cenzuru.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Å to su mostovi?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Mostovi %s su Tor releji koji vam pomaÅ¾u zaobiÄ?i cenzuru."
+msgstr "%s Mostovi %s su Tor releji koji pomaÅ¾u zaobiÄ?i cenzuru."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Trebam alternativni naÄ?in preuzimanja mostova!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "JoÅ¡ jedan naÄ?in za preuzimanje mostova je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih davatelja email usluge: %s, %s ili %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Drugi naÄ?in dobivanja mostova jest slanje e-maila na %s. Ostavi polje predmeta e-maila\npraznim, a u sadrÅ¾aju poruke napiÅ¡i â??get transport obfs4â??. Napomena: e-mail se\nmora poslati pomoÄ?u adrese jednog od sljedeÄ?ih pruÅ¾atelja usluge e-poÅ¡te:\n%s ili %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Moji mostovi ne rade! Treba mi pomoÄ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ako VaÅ¡ Tor ne radi, poÅ¡aljite email na %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PokuÅ¡ajte ukljuÄ?iti Å¡to viÅ¡e informacija o svom sluÄ?aju, ukljuÄ?ujuÄ?i popis\nmostova i prikljuÄ?nih transporta koje ste pokuÅ¡ali koristiti, verziju svog Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ako se tvoj Tor preglednik ne da povezati, pogledaj %s i naÅ¡ %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
-msgstr "Ovo su linije vaÅ¡ih mostova:"
+msgstr "Ovo su redci tvojih mostova:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr "Preuzmite mostove!"
+msgstr "Preuzmi mostove!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mehanizmi za distribuciju mostova"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementira Ä?etiri mehanizma za distribuciju mostova: â??HTTPSâ??, â??Moatâ??,\nâ??E-poÅ¡taâ?? i â??Rezerviranoâ??. Mostovi koji se ne distribuiraju preko BridgeDB-a koriste\npseudo-mehanizam â??Bezâ??. SljedeÄ?i popis ukratko objaÅ¡njava kako ti mehanizmi\nrade, a naÅ¡e %smetrike BridgeDB-a%s prikazuju popularnost svakog\npojedinog mehanizma."
+
+#: bridgedb/strings.py:115
+#, 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 "â??HTTPSâ??  mehanizam za distribuciju pruÅ¾a mostove preko ovog web mjesta.\nZa dobivanje mostova, idi na %sbridges.torproject.org%s, odaberi Å¾eljene\nopcije i rijeÅ¡i naknadni CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, 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 "â??Moatâ?? mehanizam za distribuciju dio je Tor preglednika, a korisnicima omoguÄ?uje\nzatraÅ¾iti mostove u postavkama Tor preglednika. Za dobivanje mostova, idi na\n%sTor postavke%s tvog Tor preglednika, klikni na â??ZatraÅ¾i novi mostâ?? i rijeÅ¡i\nnaknadni CAPTCHA, a Tor preglednik Ä?e automatski dodati tvoje nove mostove."
+
+#: bridgedb/strings.py:125
+#, 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 "Korisnici mogu zatraÅ¾iti mostove putem mehanizma za distribuciju â??E-poÅ¡taâ??, slanjem\ne-poÅ¡te na %sbridges@xxxxxxxxxxxxxx%s i upisom â??preuzmi obfs4 transportâ?? u\nsadrÅ¾aju e-poÅ¡te."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Rezervirano"
+
+#: bridgedb/strings.py:130
+#, 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 odrÅ¾ava mali broj mostova koji se ne distribuiraju automatski.\nUmjesto toga, te mostove zadrÅ¾avamo za ruÄ?nu distribuciju i predajemo ih\nnevladinim i drugim organizacijama kao i pojedincima koji trebaju mostove.\nMostovi koji se distribuiraju preko mehanizma â??Rezerviranoâ??, moÅ¾da neÄ?e\nvidjeti korisnike duÅ¾e vrijeme. Mehanizam za distribuciju â??Rezerviranoâ??,\nnaziva se â??Nedodijeljenoâ?? u datotekama %sbaze za dodjelu mostova%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Bez"
+
+#: bridgedb/strings.py:138
+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 "Mostovi, Ä?iji je mehanizam za distribuciju â??Bezâ??, BridgeDB ne distribuira.\nOdgovornost je operatera mosta da distribuira svoje mostove korisnicima.\nU pretraÅ¾ivanju releja, svjeÅ¾e postavljen mehanizam za distribuciju mosta\npostavljen je na â??Bezâ?? za otprilike jedan dan. Malo se strpi i on Ä?e se promijeniti\nu stvarni mehanizam za distribuciju mosta.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
-msgstr "Molimo odaberite opcije za tip mosta:"
+msgstr "Odaberi opcije za vrstu mosta:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
-msgstr "Trebaju li Vam IPv6 adrese?"
+msgstr "TrebaÅ¡ IPv6 adrese?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Trebate li %s?"
+msgstr "TrebaÅ¡ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
-msgstr "VaÅ¡ preglednik ne prikazuje slike ispravno."
+msgstr "Tvoj preglednik ne prikazuje slike ispravno."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
-msgstr "Unesite znakove sa slike iznad..."
+msgstr "UpiÅ¡i znakove iz gornje slike â?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Kako poÄ?eti koristite mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Kako bi unijeli mostove u Tor Browser, prvo posjetite %s Tor Browser stranicu\nza preuzimanje %s, a zatim slijedite upute za preuzimanje i pokretanje\nTor Browsera."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Najprije moraÅ¡ %spreuzeti Tor preglednik%s. NaÅ¡ korisniÄ?ki priruÄ?nik za\nTor preglednik objaÅ¡njava kako dodati vlastite mostove u Tor preglednik.\nZa sustave Windows, Linux ili OS X, %spritisni ovdje%s i saznaj viÅ¡e.\nZa Android, %spritisni ovdje%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Dodaj ove mostove u svoj Tor preglednik. Otvori postavke\npreglednika, pritisni â??Torâ??, a zatim ih dodaj u polje â??OmoguÄ?i mostâ??."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokira li VaÅ¡ Internet Service Provider (ISP - pruÅ¾atelj internet usluge) ili ikako drugaÄ?ije cenzurira veze\ns Tor mreÅ¾om?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(ZatraÅ¾i neprikrivene Tor mostove.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Odaberite 'Da', a zatim 'SljedeÄ?e'. Da bi konfigurirali svoje nove mostove, kopirajte i \nzalijepite linije mostova u kuÄ?icu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiÄ?ete na probleme, probajte kliknuti  'PomoÄ?'\nu Ä?arobnjaku 'Postavke Tor mreÅ¾e' za daljnju pomoÄ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Prikazuje ovu poruku."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "ZatraÅ¾i dobre, stare mostove."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "ZatraÅ¾i IPv6 mostove."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "ZatraÅ¾i prikljuÄ?ni transport po tipu."
+msgid "(Request IPv6 bridges.)"
+msgstr "(ZatraÅ¾i IPv6 mostove.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG kljuÄ?a."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(ZatraÅ¾i obfs4 prikrivene mostove.)"
diff --git a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
index 0b6d9fe..04c8181 100644
--- a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
@@ -1,157 +1,173 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # benewfy <benewfy@xxxxxxxxx>, 2015
 # Blackywantscookies, 2014
 # Lajos Pasztor <mrlajos@xxxxxxxxx>, 2014
+# PB, 2020
 # GergÅ? Felde <taiurin@xxxxxxxxx>, 2014
-# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015,2018
+# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015,2018-2020
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-12-28 15:07+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-18 08:40+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Nyelv"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Hiba jelentÃ©se"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ForrÃ¡s kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "VÃ¡ltozÃ¡sok"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Mindent kijelÃ¶l"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR KÃ³d megjelenÃtÃ©se"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR KÃ³d a hÃd sorokhoz"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "HoppÃ¡!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ã?gytÅ±nik a QR KÃ³d hibÃ¡s."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ez a QR KÃ³d a hÃd sorait tartalmazza. Olvassa be egy QR KÃ³d olvasÃ³val, hogy Ã¡tmÃ¡solja a HÃd sorokat mobil Ã©s egyÃ©b eszkÃ¶zeire."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "A BridgeDB hibÃ¡ra futott."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Jelenleg nincsenek rendelkezÃ©sre Ã¡llÃ³ hidak..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "TalÃ¡n megprÃ³bÃ¡lhatnÃ¡l %s vissza menni %s Ã©s mÃ¡sik HÃd tÃpust vÃ¡lasztani."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "LÃ©pÃ©s %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "LetÃ¶ltÃ©s %s Tor Browser %s"
+msgstr "LetÃ¶ltÃ©s %s Tor BÃ¶ngÃ©szÅ? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "LÃ©pÃ©s %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Hidak %s beszerzÃ©se"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "LÃ©pÃ©s %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor Browser-hez %s"
+msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor BÃ¶ngÃ©szÅ?hÃ¶z %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%ssak adjÃ¡l mÃ¡r nekem hidakat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "HaladÃ³ beÃ¡llÃtÃ¡sok"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nem"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Semmi"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%szeretnÃ©k!"
@@ -159,69 +175,37 @@ msgstr "%sS%szeretnÃ©k!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%szerezni Bridge -et!"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ez egy automata levÃ©l, kÃ©rjÃ¼k ne vÃ¡laszoljon.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ez egy automata levÃ©l.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Itt vannak a hÃdjaid:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ã?n tÃºllÃ©pte a megadott mÃ©rtÃ©k hatÃ¡rt. KÃ©rÃ¼nk lassÃtson le! A minimum idÅ? email-ek kÃ¶zÃ¶tt\n%s Ã³ra. Minden tovÃ¡bbi emailt ez az idÅ? alatt elutasÃtunk."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombinÃ¡lja COMMANDs-okat hogy tÃ¶bbfÃ©le opciÃ³t adhasson meg egyszerre)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ã?dvÃ¶zÃ¶l a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Jelenleg tÃ¡mogatott Ã¡tviteli tÃpusok: "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "HÃ©, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hello!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "NyilvÃ¡nos kulcsok"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ez az email szivÃ¡rvÃ¡nyokkal, unikornisokkal, Ã©s ragyogÃ¡sokkal volt generÃ¡lva\n%s -nek  %s -Ã¡n  %s -kor."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ha ezek a hidak nem azok, amikre szÃ¼ksÃ©ge van, vÃ¡laszoljon erre az emailre,\na kÃ¶vetkezÅ? parancsokkal az Ã¼zenet tÃ¶rzsÃ©ben:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +216,7 @@ msgid ""
 msgstr "BridgeDB hidakat tud biztosÃtani szÃ¡mos %stÃpusÃ¡val a Pluggable Transports%s -nak\namely segÃti a kapcsolatait Ã¶sszekeverni a Tor Network-ben,  ezzel sokkal\nnehezebbÃ© teszi akÃ¡rkinek hogy megnÃ©zze az internet forgalmÃ¡t Ã©s hogy meghatÃ¡rozza hogy Tor-t hasznÃ¡l.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -244,7 +228,7 @@ msgstr "NÃ©hÃ¡ny hÃd IPv6 cÃmekkel is elÃ©rhetÅ?, habÃ¡r nÃ©gÃ¡ny Pluggable\nT
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +237,169 @@ msgid ""
 "\n"
 msgstr "Ezen felÃ¼l, BridgeDB -nek van sok rÃ©gi mÃ³di \"vanÃlia\"  hÃdjai %s melyek CsatlakoztathatÃ³ SzÃ¡llÃtÃ³k %s nÃ©lkÃ¼l vannak\nmely talÃ¡n nem hallatszik szuperÃ¼l, de Å?k mÃ©g mindig\ntudnak segÃteni kikerÃ¼lni az internet cenzÃºrÃ¡jÃ¡t.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Mik is a Hidak?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "A %s Hidak %s azok Tor relÃ©k, melyek segÃtik Ã¶nt a cenzÃºra elkerÃ¼lÃ©sÃ©ben."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "SzÃ¼ksÃ©gem van egy alternatÃv mÃ³dra a Hidak beszerzÃ©sÃ©hez!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Egy mÃ¡sik mÃ³dja, hogy megkapd a bridge listÃ¡t kÃ¼ldj emailt a %s cÃmre. KÃ©rlek vedd figyelembe\naz emailt az alÃ¡bbi email szolgÃ¡ltatÃ³ cÃmekrÅ?l kÃ¼ldd:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "MÃ¡sik mÃ³dszer hidak beszerzÃ©sÃ©re, ha emailt kÃ¼ld a  a %s cÃmre.  Hagyja Ã¼resen a tÃ¡rgyat \nÃ©s Ãrja a levÃ©l tÃ¶rzsÃ©be, hogy \"get transport obfs4\". Ne felejtse\nhogy a kÃ¶vetkezÅ? szolgÃ¡ltatÃ³k valamelyikÃ©rÅ?l kell kÃ¼ldenie a levelet: \n%s vagy %s"
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "A HÃdjaim nem mÅ±kÃ¶dnek! SegÃtsÃ©gre van szÃ¼ksÃ©gem!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor bÃ¶ngÃ©szÅ?je nem mÅ±kÃ¶dik, akkor kÃ¼ldjÃ¶n egy email-t %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ³bÃ¡ljon minÃ©l tÃ¶bb informÃ¡ciÃ³t megadni amennyit csak tud, beleÃ©rtve a listÃ¡jÃ¡t \na %s hidaknak Ã©s Pluggable Transports -nak, amelyet hasznÃ¡lni prÃ³bÃ¡lt, A Tor Browser verziÃ³jÃ¡t,\nÃ©s minden Ã¼zenetet melyet Tor adott ki, stb."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ha a Tor bÃ¶ngÃ©szÅ? nem tud csatlakozni, kÃ©rjÃ¼k vessen pillantÃ¡st itt %s Ã©s itt %s"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Itt vannak a hÃd soraid:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Hidak szerzÃ©se!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "HÃd elosztÃ¡si mechanizmusok"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "Fenntartott"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Nincs"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "KÃ©rjÃ¼k, vÃ¡lasszon opciÃ³t a hÃd tÃpushoz:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Kellenek Ã¶nnek IPv6 cÃmek?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "SzÃ¼ksÃ©ge van egy %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ez a bÃ¶ngÃ©szÅ? nem jelenÃti meg a kÃ©peket rendesen."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Adja meg a karaktereket amik a fenti kÃ©pen lÃ¡thatÃ³ak ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Hogyan kezdjÃ¼k hasznÃ¡lni a hidat "
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "A hidak beÃ¡llÃtÃ¡sÃ¡hoz a Tor 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokkolja vagy cenzÃºrÃ¡zza az Ã¶n internet szolgÃ¡ltatÃ³ja (ISP) a kapcsolatokat\na Tor hÃ¡lÃ³zatÃ¡hoz?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(obfuszkÃ¡latlan Tor hidak kÃ©rÃ©se)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "VÃ¡lassza hogy 'Igen' Ã©s utÃ¡na kattintson a 'KÃ¶vetkezÅ?\"-re. Az Ã¶n Ãºj hidjai konfigurÃ¡sÃ¡hoz, mÃ¡solja\nÃ©s illessze be a HÃd sorokat a felugrÃ³ ablakba. VÃ©gÃ¼l, kattintson 'KapcsolÃ³dÃ¡s'-ra, Ã©s \nmÃ¡r kÃ©szen is van. Ha valamilyen hibÃ¡t tapasztal, prÃ³bÃ¡ljon a 'SegÃtsÃ©g'\n gombra kattintani a 'Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok' varÃ¡zslÃ³ban a tobÃ¡bbi segÃtsÃ©gÃ©rt."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "MegjelenÃti ezt az Ã¼tenetet."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Nem csatlakoztathatÃ³ szÃ¡llÃtÃ³ hÃd kÃ©relme."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPV6 hÃd kÃ©rÃ©se."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Egy csatlakoztathatÃ³ szÃ¡llÃtÃ³ kÃ©relme TYPE szerint."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6 hidak kÃ©rÃ©se.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "MÃ¡solat szertÃ©se a BridgeDB's publikus GnuPG kulcsÃ¡bÃ³l."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(obfs4 obfuszkÃ¡lt hidak kÃ©rÃ©se)"
diff --git a/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
index 4931438..ff4a74a 100644
--- a/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Hrach Mkrtchyan <mhrach87@xxxxxxxxx>, 2016
@@ -10,116 +10,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-15 05:53+0000\n"
-"Last-Translator: Sergei <serjsafarian@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?Õ¡Õ¾:"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ô¼Õ¥Õ¦Õ¸Ö?Õ¶"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Õ?Õ¡ÕµÕ¿Õ¶Õ¥Õ¬ Õ½ÕÕ¡Õ¬Õ« Õ´Õ¡Õ½Õ«Õ¶"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¸Õ¤"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Õ?Õ¸Ö?Õ¸ÕÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö?Õ« Õ´Õ¡Õ¿ÕµÕ¡Õ¶"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ô¿Õ¡Õº"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ô¸Õ¶Õ¿Ö?Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö?Õ¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Õ?Õ¸Ö?Ö?Õ¡Õ¤Ö?Õ¥Õ¬ QR Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö?Õ¨"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-Õ¯Õ¸Õ¤Õ¨Õ? Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Õ?Ö?Ö?, Õ´Õ« Õ¢Õ¡Õ¶ Õ¶Õ¥Õ¶Ö? Õ¹Õ¥Õ²Õ¡Õ¾:"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ô¿Õ¡Ö?Õ®Õ¥Õ½ Õ©Õ¥ Õ½ÕÕ¡Õ¬ Õ¿Õ¥Õ²Õ« Õ¸Ö?Õ¶Õ¥Ö?Õ¡Õ¾ Õ?Õ¥Ö? QR-Õ¯Õ¸Õ¤Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ«Õ½Ö?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ô±ÕµÕ½ QR-Õ¯Õ¸Õ¤Õ¨ ÕºÕ¡Ö?Õ¸Ö?Õ¶Õ¡Õ¯Õ¸Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨Ö? Õ?Õ¯Õ¡Õ¶Õ¡Õ¾Õ¸Ö?Õ¥Ö? Õ¡ÕµÕ¶ QR-Õ¯Õ¸Õ¤Õ¥Ö?Õ« Õ¨Õ¶Õ©Õ¥Ö?Ö?Õ«Õ¹Õ¸Õ¾Õ? Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Õ·Õ¡Ö?ÕªÕ¡Õ¯Õ¡Õ¶ Ö? Õ¡ÕµÕ¬ Õ½Õ¡Ö?Ö?Õ¥Ö?Õ¸Ö?Õ´ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö?Ö?"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ô±ÕµÕªÕ´ Õ¸Õ¹ Õ´Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ» Õ¹Õ¯Õ¡â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Õ?Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö?, Õ¡Ö?ÕªÕ¥ Ö?Õ¸Ö?Õ±Õ¥Õ¬ %s Õ¾Õ¥Ö?Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ %s Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ´Õ« Õ¡ÕµÕ¬ Õ¿Õ¥Õ½Õ¡Õ¯Ö?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Õ?Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ %sÂ«TorÂ» Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ¨%s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ %s Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ«Õ¶%s"
@@ -128,27 +143,27 @@ msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÕ?%sÕ¡Ö?Õ¦Õ¡ÕºÕ¥Õ½ Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Ö?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ô¼Ö?Õ¡Ö?Õ¸Ö?Ö?Õ«Õ¹ Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö?Õ¥Ö?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Õ?Õ¹"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Õ¢Õ¡Ö?Õ¡Õ¯Õ¡ Õ§"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÔ±%sÕµÕ¸Ö?"
@@ -156,69 +171,37 @@ msgstr "%sÔ±%sÕµÕ¸Ö?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÕ?%sÕ¿Õ¡Õ¶Õ¡Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Õ?Õ¡ Õ«Õ¶Ö?Õ¶Õ¡Õ¢Õ¡Ö? Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¾Õ¡Õ® Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ§Ö? Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¹ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Ö?]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ?"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ô´Õ¸Ö?Ö? Õ£Õ¥Ö?Õ¡Õ¦Õ¡Õ¶Ö?Õ¥Õ¬ Õ¥Ö? Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡Õ¹Õ¡Ö?Õ¨Ö? Õ?Õ¸Ö?Õ±Õ¥Ö? Õ´Õ« Ö?Õ«Õ¹ Õ¡Õ¾Õ¥Õ¬Õ« Õ¸Ö?Õ·Ö? Ô¿Ö?Õ¯Õ«Õ¶ Ö?Õ¸Ö?Õ±Õ¥Õ¬ Õ¯Õ¡Ö?Õ¥Õ¬Õ« Õ§\n%s ÕªÕ¡Õ´Õ«Ö?Ö? Ô²Õ¸Õ¬Õ¸Ö? Õ¶Õ¡Õ´Õ¡Õ¯Õ¶Õ¥Ö?Õ¨, Õ¸Ö?Õ¸Õ¶Ö? Õ¯Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¾Õ¥Õ¶ Õ¡ÕµÕ¤ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ¸Ö?Õ´, Õ¯Õ¡Ö?Õ°Õ¡Õ´Õ¡Ö?Õ¾Õ¥Õ¶Ö?"
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Õ?Õ?Ô±Õ?Ô±Õ?Õ?ÔµÕ?Õ? (Õ´Õ«Õ¡Õ¾Õ¸Ö?Õ¥Ö? Õ°Ö?Õ¡Õ´Õ¡Õ¶Õ¶Õ¥Ö?Õ¨Õ? Õ´Õ«Õ¡ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ´Õ« Ö?Õ¡Õ¶Õ« Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö? Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ô²Õ¡Ö?Õ« Õ£Õ¡Õ¬Õ¸Ö?Õ½Õ¿ Â«BridgeDBÂ»Ö?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ô²Õ¸Õ¬Õ¸Ö? Õ½ÕºÕ¡Õ½Õ¡Ö?Õ¯Õ¾Õ¸Õ² transport TYPE-Õ¥Ö?Õ¨."
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Õ?Õ¥Õ?Õµ, %sÖ?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ô²Õ¡Ö?Ö?Õ?, Õ¨Õ¶Õ¯Õ¥Ö?Õ½:"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Õ?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ô±ÕµÕ½ Õ¶Õ¡Õ´Õ¡Õ¯Õ¨ Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¥Õ¬ Õ§ Õ®Õ«Õ¡Õ®Õ¡Õ¶Õ¶Õ¥Ö?Õ¸Õ¾, Õ´Õ«Õ¡Õ¥Õ²Õ»ÕµÕ¸Ö?Ö?Õ¶Õ¥Ö?Õ¸Õ¾ Õ¸Ö? Õ¢Ö?Õ¥Õ¼Õ¡Ö?Õ¡ÕµÕ¬Õ¸Õ¾\n%s-Õ« Õ°Õ¡Õ´Õ¡Ö?, %s-Õ«Õ¶, ÕªÕ¡Õ´Õ¨ %s-Õ«Õ¶5"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
 msgstr "BridgeDB-Õ¶ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ·ÕÕ¡Õ¿Õ¥Õ¬ %sÕ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ´Õ¡Õ¶ Õ´Õ« Ö?Õ¡Õ¶Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ¶Õ¥Ö?Õ« Õ°Õ¥Õ¿%s,\nÕ«Õ¶Õ¹Õ¶ Ö?Õ£Õ¶Õ¸Ö?Õ´ Õ§ Ö?Õ¸Õ²Õ¡Ö?Õ¯Õ¥Õ¬ Õ?Õ¥Ö? Õ´Õ«Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨ Tor-Õ« Ö?Õ¡Õ¶Ö?Õ«Õ¶Õ? Õ¤Õ¡Ö?Õ±Õ¶Õ¥Õ¬Õ¸Õ¾\nÕ?Õ¥Ö? Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö?Õ«Õ¶ Õ°Õ¥Õ¿Ö?Õ¥Õ¬Õ¨ Ö? Õ?Õ¥Õ¦ Õ¢Õ¡Ö?Õ¡Õ°Õ¡ÕµÕ¿Õ¥Õ¬Õ¨\n Õ¡Õ¾Õ¥Õ¬Õ« Õ¤ÕªÕ¾Õ¡Ö?Ö?\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,7 @@ msgstr "Õ?Ö?Õ¸Õ· Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´ Õ¥Õ¶ IPv6-Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
 "\n"
 msgstr "Õ?Õ¡Õ¾Õ¥Õ¬Õ¥Õ¶Ö?, Õ¸Ö? BridgeDB-Õ¶ Õ¸Ö?Õ¶Õ« Õ¶Õ¡Ö? Õ¢Õ¡Õ¦Õ¸Ö?Õ´ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?, Õ¸Ö?Õ¸Õ¶Ö? Õ¹Õ¥Õ¶ Õ¡Õ»Õ¡Õ¯Ö?Õ¸Ö?Õ´\n%s Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ¸Ö?Õ´Õ¨ %s, Õ«Õ¶Õ¹Õ¨ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ¦Õ¤Õ¥Õ¬ Õ¯Õ¡ÕµÖ?Õ« Õ§Õ»Õ« Õ¿Õ¥Õ½Ö?Õ« Õ¾Ö?Õ¡,\nÕ¢Õ¡ÕµÖ? Õ·Õ¡Õ¿ Õ¤Õ¥ÕºÖ?Õ¥Ö?Õ¸Ö?Õ´ Õ¯Õ¡Ö?Õ¸Õ² Õ¥Õ¶ Ö?Õ£Õ¶Õ¥Õ¬  Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ô»Õ?Õ¶Õ¹ Õ¥Õ¶ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨Ö?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ô¿Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ %s Tor-Õ« Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö? Õ¥Õ¶, Õ¸Ö?Õ¸Õ¶Ö? Ö?Õ£Õ¶Õ¸Ö?Õ´ Õ¥Õ¶ Õ?Õ¥Õ¦ Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ô»Õ¶Õ± ÕºÕ¥Õ¿Ö? Õ§ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö?  Õ¡ÕµÕ¬ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Ö?"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ô¿Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö? Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯ Õ§ Õ§Õ¬. Õ¶Õ¡Õ´Õ¡Õ¯ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Õ¬Õ¨ %s Õ°Õ¡Õ½Ö?Õ¥Õ«Õ¶Ö?\nÕ?Õ¡Õ·Õ¾Õ« Õ¡Õ¼Õ¥Ö?, Õ¸Ö? Ô´Õ¸Ö?Ö? ÕºÕ¥Õ¿Ö? Õ§ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Ö? Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯Õ¨ Õ°Õ¥Õ¿Ö?ÕµÕ¡Õ¬\nÕ§Õ¬. Ö?Õ¸Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ´Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¶Õ¥Ö?Õ«Ö? Õ¸Ö?Ö?Õ§ Õ´Õ¥Õ¯Õ« Õ´Õ«Õ»Õ¸Ö?Õ¸Õ¾.\n%s,%s Õ¯Õ¡Õ´ %sÖ?"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ô»Õ´ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ Õ¹Õ¥Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´Ö? Ô»Õ¶Õ± Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ§ ÕºÕ¥Õ¿Ö?Ö?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ÔµÕ©Õ¥ Õ?Õ¥Ö? Tor-Õ¨ Õ¹Õ« Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´, ÕºÕ¥Õ¿Ö? Õ§ Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Õ¬ %s: "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Õ?Õ¸Ö?Õ±Õ¥Ö? Õ¶Õ¥Ö?Õ¡Õ¼Õ¥Õ¬ Õ¸Ö?Ö?Õ¡Õ¶ Õ°Õ¶Õ¡Ö?Õ¡Õ¾Õ¸Ö? Õ§ Õ·Õ¡Õ¿ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö? Õ?Õ¥Ö? Õ¤Õ¥ÕºÖ?Õ« Õ¾Õ¥Ö?Õ¡Õ¢Õ¥Ö?ÕµÕ¡Õ¬, Õ¶Õ¥Ö?Õ¡Õ¼ÕµÕ¡Õ¬ Õ¡ÕµÕ¶ bridge-Õ¶Õ¥Ö?Õ«\nÖ? Pluggable Transport-Õ¶Õ¥Ö?Õ« Ö?Õ¡Õ¶Õ¯Õ¨, Õ¸Ö?Õ¸Õ¶Ö? Ö?Õ¸Ö?Õ±Õ¥Õ¬ Õ¥Ö? Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬, Õ?Õ¥Ö? Tor Browser-Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¨,\n Ö?Õ¡Õ¶Õ¯Õ¡Ö?Õ¡Õ® Õ¡ÕµÕ¬ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶, Õ¸Ö? Tor-Õ¨ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¥Õ¬ Õ§ Õ?Õ¥Õ¦, Ö? Õ¡ÕµÕ¬Õ¶:"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ô±Õ°Õ¡ Õ?Õ¥Ö? bridge line-Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Õ?Õ¿Õ¡Ö?Õ¥Õ?Ö? Bridge-Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ bridge-Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¶Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ¥Õ¶ IPv6 Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ§ %s:"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Õ?Õ¥Ö? Õ¢Ö?Õ¡Õ¸Ö?Õ¦Õ¥Ö?Õ¨ Õ¶Õ¯Õ¡Ö?Õ¶Õ¥Ö?Õ¨ Õ³Õ·Õ¿Õ¸Ö?Õ¥Õ¶ Ö?Õ¸Ö?ÕµÖ? Õ¹Õ« Õ¿Õ¡Õ¬Õ«Õ½:"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ?Ö? Õ¿Õ¡Õ¼Õ¡Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö?Õ¨ Õ¾Õ¥Ö?Ö?Õ« Õ¶Õ¯Õ¡Ö?Õ«Ö?:"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ô»Õ¶Õ¹ÕºÕ¥Õ?Õ½ Õ½Õ¯Õ½Õ¥Õ¬ Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬ Õ?Õ¥Ö? bridge-Õ¶Õ¥Ö?Õ¨:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? bridge-Õ¶Õ¥Ö?Õ¨ Tor Browser, Õ¶Õ¡Õ Õ´Õ¿Õ¥Õ?Ö? %sTor Browser-Õ« Õ¶Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ§Õ»Õ¨%s Ö? Õ°Õ¥Õ¿Ö?Õ¥Õ?Ö? Õ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶Õ? Õ¶Õ¥Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö? Ö? Õ£Õ¸Ö?Õ®Õ¡Ö?Õ¯Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Tor Browser-Õ¨:"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ÔµÖ?Õ¢ Â«Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Â»-Õ¨ Õ¢Õ¡Ö?Õ¾Õ«Õ? Õ½Õ¥Õ²Õ´Õ¥Ö? Â«Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Â» Ö? Õ°Õ¥Õ¿Ö?Õ¥Ö?\nÕ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶ Õ´Õ«Õ¶Õ¹Ö? Õ¡ÕµÕ¶ Õ°Õ¡Ö?Ö?Õ¶Õ«."
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Õ?Õ¥Ö? Ô»Õ¶Õ¿Õ¥Ö?Õ¶Õ¥Õ¿ Ô¾Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö? Õ?Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¨ (ISP) Õ¡Ö?Õ£Õ¥Õ¬Õ¡Ö?Õ¡Õ¯Õ¸Ö?Õ´ Õ¯Õ¡Õ´ Õ°Õ¥Õ¿Õ¡Ö?Õ¶Õ¶Õ¸Õ?Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ´Õ«Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨\nTor Ö?Õ¡Õ¶Ö?Õ«Õ¶:"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Õ?Õ¥Õ²Õ´Õ¥Ö? Â«Ô±ÕµÕ¸Â», Õ«Õ½Õ¯ Õ°Õ¥Õ¿Õ¸ Â«Õ?Õ¡Õ»Õ¸Ö?Õ¤Õ¨Â»: Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Õ?Õ¥Ö? Õ¶Õ¸Ö? bridge-Õ¶Õ¥Ö?Õ¨, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö? Ö?\nÕ¿Õ¥Õ²Õ¡Õ¤Ö?Õ¥Ö? bridge line-Õ¨ Õ¿Õ¥Ö?Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö?Õ´: Õ?Õ¥Ö?Õ»Õ¸Ö?Õ´, Õ½Õ¥Õ²Õ´Õ¥Ö? Â«Õ?Õ«Õ¡Õ¶Õ¡Õ¬Â», Ö? Ô´Õ¸Ö?Ö? ÕºÕ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ¯Õ¬Õ«Õ¶Õ¥Ö?: ÔµÕ©Õ¥ Õ¹Õ¯Õ¸Õ²Õ´Õ¶Õ¸Ö?Õ¸Õ·Õ¾Õ¥Ö?Õ? Ö?Õ¸Ö?Õ±Õ¥Ö? Õ½Õ¥Õ²Õ´Õ¥Õ¬ Â«Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Â»\nÕ¯Õ¸Õ³Õ¡Õ¯Õ¨ Â«Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Â»-Õ¸Ö?Õ´Õ? Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö?:"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Õ?Õ¸Ö?Ö?Õ¡Õ¤Ö?Õ¸Ö?Õ´ Õ§ Õ¡ÕµÕ½ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨:"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ IPv6 bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ Pluggable Transport-Õ« Õ°Õ¡Õ´Õ¡Ö?Õ? Õ¨Õ½Õ¿ TYPE-Õ«: "
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ BridgeDB-Õ« public Gnu-PG key-Õ« ÕºÕ¡Õ¿Õ³Õ¥Õ¶:"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
index 197ac30..4f97925 100644
--- a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
@@ -1,20 +1,22 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # anzhyo, 2014
 # Astryd Viandila Dahlan, 2015
 # cholif yulian <cholifyulian123@xxxxxxxxx>, 2015
 # constantius damar wicaksono <constantiusdamar@xxxxxxxxx>, 2015
-# Dwi Cahyono <dwexz_cie@xxxxxxxxx>, 2015
+# wongcie <dwexz_cie@xxxxxxxxx>, 2015
 # Ferriandy Chianiago <gpl4all@xxxxxxxxx>, 2015
+# Fery Setiawan <gembelweb@xxxxxxxxx>, 2020
 # ical, 2019
 # Lucas Susanto <susantolucas@xxxxxxxxx>, 2018
 # MasIs <is.roadster@xxxxxxxxx>, 2013
 # L1Nus <multazam_ali@xxxxxx>, 2014
 # Ngalim Siregar <ngalim.siregar@xxxxxxxxx>, 2015
 # km242saya <pencurimangga@xxxxxxxxx>, 2014
+# Suryadi Harun <suryadiharun08@xxxxxxxxx>, 2019
 # Wahyu Utomo Nurindrayanto <wahyutomo66@xxxxxxxxx>, 2016
 # Yerry Borang <yerry.borang@xxxxxxxxx>, 2019
 # zk, 2015
@@ -22,116 +24,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-03-23 06:24+0000\n"
-"Last-Translator: Yerry Borang <yerry.borang@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Laporkan bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kode Sumber"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Perubahan"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontak"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tampilkan QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode untuk bridge Anda"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ada masalah!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Ada masalah saat mengambil QRCode Anda."
+msgstr "Tampaknya ada galat kesalahan dalam mendapatkan QRCode Anda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "QRCode ini berisi jalur bridge Anda. Scan dengan pembaca QRCode untuk menyimpan jalur bridge Anda ke dalam perangkat mobile ataupun perangkat lainnya."
+msgstr "QRCode ini berisi garis jembatan Anda. Pindai dengan pembaca QRCode untuk salin garis jembatan Anda ke perangkat seluler dan lainnya."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Belum ada bridge yang tersedia..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
+msgstr " Mungkin Anda harus mencoba %s kembali  %s dan memilih tipe jembatan yang berbeda!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Langkah %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Unduh %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Langkah %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s bridge %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
@@ -140,27 +157,27 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serikan saya bridge!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Pilihan Lebih Lanjut"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -168,69 +185,37 @@ msgstr "%sY%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sapatkan Jembatan!"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah pesan otomatis; mohon untuk tidak dibalas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Berikut jembatan Anda:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda minimum antara\nsurel adalah %s jam. Semua surel lainnya selama waktu periode ini akan diabaikan."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "PERINTAH: (gabungkan PERINTAH untuk menetapkan beberapa opsi secara bersamaan)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Selamat datang di BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Saat ini mendukung transport TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hai, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Halo, kawan!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Kunci Publik"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Surel ini dihasilkan dengan pelangi, unikorn, dan kilauan\nuntuk %s pada %s jam %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -241,7 +226,7 @@ msgid ""
 msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -253,7 +238,7 @@ msgstr "Beberapa jembatan dengan alamat IPv6 juga tersedia, walaupun beberapa Pl
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -262,134 +247,169 @@ msgid ""
 "\n"
 msgstr "Sebagai tambahan, BridgeDB memiliki banyak jembatan biasa saja %s tanpa\nPluggable Transports %s yang mungkin tidak terdengar keren, tapi dalam banyak kasus\nmereka masih bisa membantu untuk menghindari sensor pada internet.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Apa itu jembatan?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Cara lain untuk mendapatkan Jembatan adalah dengan mengirimkan surel ke %s.\nMohon dicatat bahwa Anda harus mengirim surel menggunakan alamat dari\nsalah satu penyedia layanan surel berikut: %s, %s atau %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Coba sertakan sebanyak mungkin info tentang masalah Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Tor Browser Anda, dan pesan apapun yang diberikan oleh Tor, dll."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Jika Peramban Tor anda tidak dapat terhubung, harap lihat pada %s dan %skami."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Berikut jembatan Anda:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Dapatkan Jembatan!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Tidak ada"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Mohon pilih opsi untuk tipe jembatan:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Apakah Anda membutuhkan alamat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Apakah Anda membutuhkan %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan karakter dari gambar di atas..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Cara memulai menggunakan jembatan Anda"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Untuk 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Apakah Penyedia Layanan Internet (ISP) Anda menutup akses atau menyensor\nkoneksi ke jaringan Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Pilih 'Ya' dan kemudian klik 'Lanjut'. Untuk mengkonfigurasi jembatan baru Anda, salin dan\ntempel alamat jembatan ke dalam kotak teks masukan. Akhirnya, klik 'Sambung', dan\nAnda siap menjelajah! Jika Anda mengalami kesulitan, coba klik tombol 'Bantuan'\ndi penuntun 'Pengaturan Jaringan Tor' untuk petunjuk lebih lanjut."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Tampilkan pesan ini"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Minta jembatan yang biasa."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Minta jembatan IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Minta Pluggable Transport berdasarkan TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dapatkan salinan kunci publik GnuPG BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
index b9c424f..e54fe76 100644
--- a/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
@@ -1,123 +1,138 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2016-2017
+# Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2016-2017,2019-2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-01-22 09:08+0000\n"
-"Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "TungumÃ¡l"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Tilkynna um villu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "GrunnkÃ³Ã°i"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "BreytingaannÃ¡ll"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Hafa samband"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Velja allt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Birta QR-kÃ³Ã°a"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kÃ³Ã°i fyrir brÃºarlÃnurnar Ã¾Ãnar"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ã?, Ã¦, skrambans!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Villa kom upp Ã¾egar Ã¾Ãº reyndar aÃ° nÃ¡lgast QR-kÃ³Ã°ann Ã¾inn."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ã?essi QR-kÃ³Ã°i inniheldur brÃºarlÃnurnar Ã¾Ãnar. SkannaÃ°u QR-kÃ³Ã°ann meÃ° strikamerkjalesara til aÃ° afrita brÃºarlÃnurnar yfir Ã¡ farsÃma og Ã¶nnur snjalltÃ¦ki."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Engar brÃ½r eru tiltÃ¦kar Ã augnablikinu..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Hugsanlega Ã¦ttirÃ°u aÃ° reyna aÃ° %s fara til baka %s og velja aÃ°ra tegund brÃºar!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Skref %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "SÃ¦kja %s Tor-vafrann %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Skref %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "NÃ¡ Ã %s brÃ½r %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Skref %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃºna Ã¡ aÃ° %s bÃ¦ta brÃºnum viÃ° Tor-vafrann %s"
@@ -126,27 +141,27 @@ msgstr "NÃºna Ã¡ aÃ° %s bÃ¦ta brÃºnum viÃ° Tor-vafrann %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%sefÃ°u mÃ©r bara brÃ½rnar!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "NÃ¡nari stillingar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ekkert"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÃ¡!"
@@ -154,69 +169,37 @@ msgstr "%sJ%sÃ¡!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sÃ¡ Ã brÃ½r"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ã?etta er sjÃ¡lfvirkt skeyti; ekki svara Ã¾vÃ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ã?etta er sjÃ¡lfvirkur tÃ¶lvupÃ³stur.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "HÃ©r eru brÃ½rnar Ã¾Ãnar:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ã?Ãº hefur fariÃ° fram Ãºr Ã¾Ã©r, slakaÃ°u aÃ°eins Ã¡! LÃ¡gmarkstÃmi milli tÃ¶lvupÃ³stsendinga\ner %s klukkustundir. Allar auka-pÃ³stsendingar Ã¡ Ã¾vÃ tÃmabili verÃ°a hunsaÃ°ar."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "SKIPUN: (sameinaÃ°u skipanir til aÃ° skilgreina marga valkosti Ã einu)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkomin Ã BridgeDB brÃºagagnagrunninn!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Studdar TYPE tegundir tengileiÃ°a:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "HÃ¦, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "SÃ¦ll vinur!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Dreifilyklar"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ã?essi tÃ¶lvupÃ³stur var ÃºtbÃºinn meÃ° Ã¶llum sÃnum gÃ¶llum og gÃ¦Ã°um\nfyrir %s hjÃ¡ %s Ã¾ann %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,7 @@ msgid ""
 msgstr "BridgeDB getur ÃºtbÃºiÃ° brÃ½r meÃ° nokkrum %sgerÃ°um Pluggable Transports%s\ntengileiÃ°a, sem geta hjÃ¡lpaÃ° til viÃ° aÃ° fela tengingar Ã¾Ãnar viÃ° Tor-netiÃ°,\ngert Ã¾aÃ° enn erfiÃ°ara fyrir hvern Ã¾ann sem fylgist meÃ° netumferÃ°inni Ã¾inni\naÃ° sjÃ¡ aÃ° Ã¾Ãº sÃ©rt aÃ° nota Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,7 @@ msgstr "Einhverjar brÃ½r meÃ° IPv6 vistfÃ¶ngum eru einnig tiltÃ¦kar, en Ã¾Ã³ eru
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ msgid ""
 "\n"
 msgstr "AÃ° auki er BridgeDB meÃ° fullt af Ã³skÃ¶p venjulegum brÃºm %s sem ekki nota\nPluggable Transports %s, sem gÃ¦ti hljÃ³maÃ° aÃ°eins minna svalt, en getur samt\nhjÃ¡lpaÃ° til Ã mÃ¶rgum tilfellum til aÃ° komast framhjÃ¡ ritskoÃ°un.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "HvaÃ° eru brÃ½r?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s BrÃ½r %s eru Tor-endurvarpar sem hjÃ¡lpa Ã¾Ã©r viÃ° aÃ° komast framhjÃ¡ ritskoÃ°un."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ã?g Ã¾arf einhverja aÃ°ra leiÃ° til aÃ° nÃ¡ Ã brÃ½r!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ã?nnur leiÃ° til aÃ° nÃ¡ Ã brÃ½r er aÃ° senda tÃ¶lvupÃ³st til %s. AthugaÃ°u aÃ° Ã¾Ãº verÃ°ur\naÃ° senda tÃ¶lvupÃ³stinn meÃ° netfangi frÃ¡ einhverjum aÃ° eftirtÃ¶ldum pÃ³stÃ¾jÃ³nustum:\n%s, %s eÃ°a %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ã?nnur leiÃ° til aÃ° nÃ¡ Ã brÃ½r er aÃ° senda tÃ¶lvupÃ³st til %s. Skildu viÃ°fangsefni pÃ³stsins\neftir autt og skrifaÃ°u \"get transport obfs4\" Ã meginmÃ¡l skilaboÃ°anna.\nAthugaÃ°u aÃ° Ã¾Ãº verÃ°ur\naÃ° senda tÃ¶lvupÃ³stinn meÃ° netfangi frÃ¡ einhverjum aÃ° eftirtÃ¶ldum pÃ³stÃ¾jÃ³nustum:\n%s eÃ°a %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "BrÃ½rnar mÃnar virka ekki! Ã?g Ã¾arf hjÃ¡lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ef Tor virkar ekki, Ã¦ttirÃ°u aÃ° senda tÃ¶lvupÃ³st Ã¡ %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Reyndu aÃ° hafa meÃ° eins miklar upplÃ½singar um aÃ°stÃ¦Ã°ur Ã¾Ãnar eins og hÃ¦gt er,\nÃ¾ar meÃ° taliÃ° allar Ã¾Ã¦r brÃ½r og Pluggable Transport tengileiÃ°ir Ã¾Ãº reyndir aÃ° nota,\nÃºtgÃ¡fu Tor-vafrans, auk allra skilaboÃ°a sem komu frÃ¡ Tor, o.s.frv.."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ef Tor-vafrinn Ã¾inn nÃ¦r ekki aÃ° tengjast, skoÃ°aÃ°u Ã¾Ã¡ %s og %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "HÃ©r eru brÃºarlÃnurnar Ã¾Ãnar:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "SÃ¦kja brÃ½r!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "FrÃ¡tekiÃ°"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Engin"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Veldu valkosti fyrir tegund brÃºar:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ã?arftu IPv6-vistfÃ¶ng?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ã?arftu %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Vafrinn Ã¾inn birtir myndir ekki rÃ©tt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Settu inn stafina Ãºr myndinni hÃ©r aÃ° ofan..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "LeiÃ°ir til aÃ° byrja aÃ° nota brÃ½rnar Ã¾Ãnar"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Hindrar eÃ°a ritskoÃ°ar netÃ¾jÃ³nustuaÃ°ilinn Ã¾inn (ISP) Ã¡ einhvern hÃ¡tt tengingar\ninn Ã¡ Tor-netiÃ°?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(BiÃ°ja um ekki-villandi Tor-brÃ½r.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Veldu 'JÃ¡' og smelltu sÃÃ°an Ã¡ 'NÃ¦sta'. Til aÃ° setja upp nÃ½ju brÃ½rnar Ã¾Ãnar, afritaÃ°u\nog lÃmdu brÃºarlÃnurnar inn Ã textareitinn. AÃ° lokum smellirÃ°u Ã¡ 'Tengjast', og Ã¾Ã¡\nÃ¦tti allt aÃ° vera tilbÃºiÃ°! Ef Ã¾Ãº lendir Ã vandrÃ¦Ã°um, geturÃ°u prÃ³faÃ° aÃ° smella Ã¡\n'HjÃ¡lp'-hnappinn Ã 'Netstillingar Tor'-leiÃ°arvÃsinum."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Birtir Ã¾essi skilaboÃ°."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "BiÃ°ja um venjulegar brÃ½r."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "BiÃ°ja um IPv6-brÃ½r."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "BiÃ°ja um Pluggable Transport tengileiÃ° eftir TYPE tegundum."
+msgid "(Request IPv6 bridges.)"
+msgstr "(BiÃ°ja um IPv6-brÃ½r.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "NÃ¡ Ã afrit af GnuPG-dreifilykli frÃ¡ BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(BiÃ°ja um villandi obfs4-brÃ½r.)"
diff --git a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
index b42d64e..afd682d 100644
--- a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Alberto <alberto.pilato@xxxxxxxxx>, 2015
@@ -8,7 +8,9 @@
 # DarkGreninja <leonardo.pantani@xxxxxxxxx>, 2017
 # fetidyoo <tru74368@xxxxxxxxx>, 2011
 # Francesca Ciceri <madamezou@xxxxxxxxxx>, 2014
+# Gabriele <gabboxl0@xxxxxxxxx>, 2020
 # HostFat <hostfat@xxxxxxxxx>, 2015
+# Irene Quadrelli <irene.quadrelli@xxxxxxxxx>, 2020
 # ironbishop <ironbishop@xxxxxxxx>, 2011
 # ironbishop <ironbishop@xxxxxxxx>, 2011
 # Jacob Appelbaum <jacob@xxxxxxxxxxxxx>, 2009
@@ -19,123 +21,138 @@
 # Alessandro Manfredi <a.n0on3@xxxxxxxxx>, 2011
 # Paolo Stivanin <paolostivanin@xxxxxxxxx>, 2014
 # Random_R, 2013
-# Random_R, 2013-2015
-# Sebastiano Pistore <SebastianoPistore.info@xxxxxxxxxxxxx>, 2018
+# Random_R, 2013-2015,2019-2020
+# SebastianoPistore <SebastianoPistore.info@xxxxxxxxxxxxx>, 2018
 # fetidyoo <tru74368@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-05 09:40+0000\n"
-"Last-Translator: Gio Doro <CyberMatique@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 16:43+0000\n"
+"Last-Translator: Irene Quadrelli <irene.quadrelli@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Segnala un Problema"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Codice sorgente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "NovitÃ "
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contatti"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostra Codice QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Codice QR per le tue bridge lines"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Figo!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Sembra che ci sia stato un errore nell'ottenere il tuo QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore QR per copiare le tue linee ponte sul telefono cellulare o su altri dispositivi."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ha riscontrato un problema "
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Non ci sono bridge disponibili al momento..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Scarica %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ottenere dei %s bridge %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
@@ -144,27 +161,27 @@ msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sammi i bridge e basta!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opzioni Avanzate"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nessuno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ¬!"
@@ -172,69 +189,37 @@ msgstr "%sS%sÃ¬!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sttieni Bridge"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Questo Ã¨ un messaggio inviato automaticamente, si prega di non rispondere.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Questa Ã¨ un'email automatica.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ecco i tuoi bridge:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Hai superato il limite massimo di email. Per favore rallenta! Il tempo minimo tra le email Ã¨ di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Benvenuto/a su BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs attualmente supportati:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ciao amico!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chiavi Pubbliche"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Questa email Ã¨ stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se questi bridge non sono ciÃ² che ti serve, rispondi a questa email con uno\ndei seguenti comandi nel corpo del messaggio:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,7 +230,7 @@ msgid ""
 msgstr "BridgeDB puÃ² fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiÃ¹ difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -257,7 +242,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -266,134 +251,169 @@ msgid ""
 "\n"
 msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Cosa sono i bridge?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Mi serve un altro modo per avere dei bridge!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Un altro modo di ottenere i bridge Ã¨ inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Un altro modo di ottenere bridge Ã¨ inviare un'email a %s. Lascia vuoto l'oggetto \ndell'email e scrivi \"get transport obfs4\" nel corpo del messaggio. Tieni presente\nche devi inviare il messaggio usando un indirizzo tra uno dei seguenti fornitori \ndi email: %s o %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "I miei bridge non funzionano! Mi serve aiuto!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor non ti funziona, manda un'email a %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Cerca di includere piÃ¹ informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se Tor Browser non riesce a connettersi, dai un'occhiata al %s e al nostro %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ecco le tue linee bridge:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ottieni dei Bridge!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Meccanismi di distribuzione del bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementa quattro meccanismi per distribuire i bridge: \"HTTPS\", \"Moat\",\n\"Email\", e \"Riservato\". I bridge che non sono distribuiti da BridgeDB usano\nlo pseudo-meccanismo \"Nessuno\".  La seguente lista spiega in breve come funzionano\nquesti meccanismi e le nostre %smetriche BridgeDB%s mostrano quanto sia popolare\nogni meccanismo."
+
+#: bridgedb/strings.py:115
+#, 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 "Il meccanismo di distribuzione \"HTTPS\" fornisce i bridge attraverso questo sito. Per ottenere\nbridge, vai su %sbridges.torproject.org%s, seleziona le tue opzioni preferite e\nrisolvi il CAPTCHA che segue."
+
+#: bridgedb/strings.py:119
+#, 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 "Il meccanismo di distribuzione \"Moat\" Ã¨ parte di Tor Browser, consentendo agli utenti di\nrichiedere bridge all'interno delle impostazioni di Tor Browser. Per ricevere bridge, vai alle\n%simpostazioni Tor%s di Tor Browser, clicca \"richiedi un nuovo bridge\", risolvi il\nCAPTCHA che segue e Tor Browser aggiungerÃ  automaticamente i tuoi nuovi\nbridge."
+
+#: bridgedb/strings.py:125
+#, 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 "Gli utenti possono richiedere bridge con il meccanismo di distribuzione \"Email\" inviando\nun'email a %sbridges@xxxxxxxxxxxxxx%s e scrivendo \"get transport obfs4\" nel\ncorpo del messaggio."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Riservato"
+
+#: bridgedb/strings.py:130
+#, 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 mantiene un piccolo numero di bridge che non vendono distribuiti\nautomaticamente.  Piuttosto, riserviamo quei bridge per la distribuzione a mano e\nli forniamo alle NGO ed altre organizzazioni e individui che hanno bisogno dei\nbridge.  I bridge distribuiti con il meccanismo \"Riservato\" potrebbero non\nvedere utenti per molto tempo.  Nota che il meccanismo di distribuzione \"Riservato\" Ã¨\nchiamato \"Non allocato\" nei file di %sassegnazione pool bridge%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nessuno"
+
+#: bridgedb/strings.py:138
+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 "I bridge con il meccanismo di distribuzione \"Nessuno\" non sono distribuiti da BridgeDB.\nÃ? responsabilitÃ  dell'operatore del bridge di distribuire i suoi bridge agli\nutenti. Nota che sulla Ricerca Relay, un meccanismo di distribuzione\nappena configurato dirÃ  \"Nessuno\" per circa un giorno.  Porta un po' di pazienza\ne poi cambierÃ  al vero meccanismo di distribuzione del bridge.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Seleziona le opzioni per il tipo di bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ti servono indirizzi IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ti serve un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Il tuo browser non mostra le immagini in modo corretto."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Inserisci i caratteri nell'immagine sopra..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Come iniziare a usare i tuoi bridge"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Per prima cosa devi %sscaricare Tor Browser%s. Il nostro manuale utente\n di Tor Browser spiega come puoi aggiungere bridge a Tor Browser. Se stai\n usando Windows, Linux o OS X, %sclicca qui%s per maggiori info. Se\n stai usando Android, %sclicca qui%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Aggiungi questi bridge a Tor Browser aprendo le preferenze\ndel browser, cliccando su \"Tor\" e poi aggiungendoli nel campo\n\"Fornisci un bridge\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Richiedi bridge Tor non offuscati.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleziona 'SÃ¬' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostra questo messaggio."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Richiedi bridge vanilla."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Richiedi bridge IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Richiedi un Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Richiedi bridge IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Richiedi bridge offuscati obfs4.)"
diff --git a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
index 6979bb4..6bac884 100644
--- a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
@@ -1,130 +1,147 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
+# 323484, 2020
 # 323484, 2018
 # brt <87@xxxxxxxxxxx>, 2013
 # ABE Tsunehiko, 2014-2015
 # azumukupoe, 2017
 # ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2013
 # ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2014
+# h345u37g3 h345u37g3, 2019
 # Masaki Saito <rezoolab@xxxxxxxxx>, 2013
 # è?¤å??ã??ç?² <m1440809437@xxxxxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "è¨?èª?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "ã??ã?°ã??å ±å??ã??ã??"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "å¤?æ?´å±¥æ´"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ã??å??ã??å??ã??ã??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ã??ã?¹ã?¦é?¸æ??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "QR ã?³ã?¼ã??ã??è¡¨ç¤º"
+msgstr "QRã?³ã?¼ã??ã??è¡¨ç¤º"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?® QR ã?³ã?¼ã??"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "ã??ã?£ã?¨ã?¹ã??ã?²ã??ã??ã?£ï¼?"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "ã??ã?ªã??ã?¸ã?®QRã?³ã?¼ã??"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR ã?³ã?¼ã??ã??ä½?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "ã??ã?® QR ã?³ã?¼ã??ã?¯ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??å?«ã?¿ã?¾ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
+msgstr "ã??ã?®ã??ã?ªã??ã?¸ã?®QRã?³ã?¼ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã??ã?£ã?¦ã??ã??ã?ªã??ã?¸ã??ã?³ã??ã?¼ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "ã??ã??ã??ã?? ã?? %s æ?»ã?£ã?¦ %s ç?°ã?ªã??ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã?¿ã??ã?¹ã??ã?§ã??ã??ã??ã??"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "ã?¹ã??ã??ã?? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "ã?¹ã??ã??ã?? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "ã?¹ã??ã??ã?? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
@@ -133,27 +150,27 @@ msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
+msgstr "%sè¨%så®?ã?ªã??ã?®ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é«?åº¦ã?ªè¨å®?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ã?ªã??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sã?¯%sã??ï¼?"
@@ -161,69 +178,37 @@ msgstr "%sã?¯%sã??ï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "%sã??%sã?ªã??ã?¸ã??å?¥æ??ã??ã??"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ã??ã?®ã?¡ã?¼ã?«ã?¯è?ªå??é??ä¿¡ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?§ã??ã??è¿?ä¿¡ã??ã?ªã??ã?§ã??ã? ã??ã??ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?¯ã??ã?¡ã??:"
+msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ï¼?"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "ã?¬ã?¼ã??å?¶é??ã??è¶?é??ã??ã?¾ã??ã??ã??ã?¡ã?¼ã?«é??ã?®æ??å°?æ??é??ã?¯ %s æ??é??ã?§ã??ã??ã??ã?®æ??é??ä¸ã?«ã??ã??ã?«é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?¯å?¨ã?¦ç?¡è¦?ã??ã??ã?¾ã??ã??"
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ã?³ã??ã?³ã??: (ã?³ã??ã?³ã??ã??çµ?ã?¿å??ã??ã??ã?¦ã??å??æ??ã?«è¤?æ?°ã?®ã?ªã??ã?·ã?§ã?³ã??æ??å®?ã??ã??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB ã?¸ã??ã??ã??ã??ï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?¾å?¨ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã??:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ã?©ã??ã?? %s ã??ã??ï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ã?©ã??ã??ã??ã??ã??ã?«ã?¡ã?¯ï¼?"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "å?¬é??é?µ"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "ã??ã?®ã?¡ã?¼ã?«ã?¯ %s ã?« %s %s ã?« rainbow å??ã?³ unicorn ã?? sparkle ã?§ç??æ??ã??ã??ã?¾ã??ã??ã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,10 +216,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB ã?¯ã??%sã?¿ã?¤ã??ã?® Pluggable Transports%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nTor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??æ??ã??ã??ã?¥ã??ã??ã??ã??ã??ã?¨ã?«å½¹ç«?ã?¡ã??ã??ã?ªã??ã?®\nã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??èª°ã??ã??ã??ã?ªã??ã?? Tor ã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã?ªã??ã?¾ã??ã??\n\n"
+msgstr "BridgeDB ã?¯ã??%sPluggable Transportsã?¿ã?¤ã??%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nã??ã?ªã??ã?®Tor Networkã?¸ã?®æ?¥ç¶?ã?®æ¤?å??ã??å??é?¿ã??ã??\nã??ã?ªã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??èª°ã??ã??ã??ã?ªã??ã?? Tor ã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã??ã?¾ã??ã??\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -246,143 +231,178 @@ msgstr "IPv6 ã?®ã?¢ã??ã?¬ã?¹ã?®ã??ã?ªã??ã?¸ã??å?©ç?¨ã?§ã??ã??ã??ã?®ã??ã??ã??ã?¾
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "å? ã??ã?¦ã??  BridgeDB ã?¯ã?? %s Pluggable Transport %s ã?®ã?ªã??å¤?ã??ã?®ä½?ã?®å¤?å?²ã??ã?ªã??\né??å¸¸ã?®ã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã?¯ã?¼ã?«ã?«ã?¯æ??ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã??ã??å¤?ã??ã?®å ´å??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
+msgstr "å? ã??ã?¦ã??  BridgeDB ã?¯ã?? %sPluggable Transportã?®ã?ªã??%s ã??ã??ã?©ã?¢ã?¤ã?¹ã?®ã??ã??ã?«ã??ã??ã?¬ã?¼ã?³ã??ã?ª\nã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã??ã?¾ã??å®?ç?¨æ?§ã??ã?ªã??ã??ã??ã?§ã??ã??ã??å®?é??ã?¯å¤?ã??ã?®å ´å??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s ã??ã?ªã??ã?¸ %s ã?¯ã?? ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??å?©ã??ã?¨ã?ªã?? Tor ã?ªã?¬ã?¼ã?§ã??ã??"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
+msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®æ?¹æ³?ã??å¿?è¦?ã?ªå ´å??"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®ã??ã??æ?¹ã?¯ %s ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??\nä»¥ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??:\n %s ã?? %s ã?¾ã??ã?¯ %s"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??ã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ã??ã?ªã??ã??ä½¿ã??ã??ã?¨ã??ã??ã??ã?ªã??ã?¸ã?? Pluggable Transports ã?? ã??å?©ç?¨ã?® Tor Browser ã??ã?¼ã?¸ã?§ã?³ã??ã??ã??ã?¦ Tor ã??å?ºå??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ç?ã?ªã?©ã??å?«ã?¿ã??å?ºæ?¥ã??é??ã??ã??ã?ªã??ã?®ã?±ã?¼ã?¹ã?«é?¢ã??ã??å¤?ã??ã?®æ??å ±ã??å?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "ã??ã??ã??ã?ªã??ã?® Tor Browser ã??æ?¥ç¶?ã?§ã??ã?ªã??å ´å??ã?¯ã??%sã??ç§?é??ã?®%sã??ã??è¦§ã??ã? ã??ã??ã??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?¯ã??ã?¡ã??ã?§ã??:"
+msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "ã?ªã??"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??è¡¨ç¤ºã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??è¦§ã??ã? ã??ã??ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¤ã?¢ã?ã?°ã??ã??ã??ã??ã?¢ã??ã??ã??ã??é??ã??è¨å®?ã??ã?¯ã?ªã??ã?¯ã??ã?¦\nè??ã??ã??ã??ã?¾ã?§ã?¦ã?£ã?¶ã?¼ã??ã?«å¾?ã?£ã?¦ã??ã? ã??ã??ã??"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "ã??å?©ç?¨ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã?ªã??ã??\nå?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã??ã??ã?«ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??\nã??ã??æº?å??ã??å?ºæ?¥ã??ã?¯ã??ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«\nã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "ã??ã?®ç?»å??ã??è¡¨ç¤º"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "vanilla ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "ã?¿ã?¤ã??ã??ã?¨ã?« Pluggable Transport ã??ã?ªã?¯ã?¨ã?¹ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB ã?® GnuPG å?¬é??é?µã?®ã?³ã??ã?¼ã??æ??ã?«å?¥ã??ã?¾ã??ã??ã??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
index b802e44..4d45ebe 100644
--- a/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Georgianization, 2018
 # George Rommel <x0rmia@xxxxxxxxx>, 2013
+# Georgianization, 2019-2020
 # Shanidze <sandro.shanidze@xxxxxxxxx>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ka\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á?? á? á??á?¦á??á?ª á??á??á? á??á??."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á??á??"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "á?®á??á? á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "á??á??á? á??á??á??á?¬á?§á??á? á?? á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "á?ªá??á??á??á??á??á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "á??á??á??á?¨á??á? á??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "á?§á??á??á??á??á?¡ á??á??á??á??á?¨á??á??á??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR-á??á??á??á??á?¡ á?©á??á??á??á??á??á??"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á?¡á??á??á??á?¡"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "á?£á?°, á? á??á?¦á??á?ª á? á??á??á??á?? á??á??á? á??á??!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "á? á??á??á??á? á?ª á?©á??á??á?¡, á? á??á?¦á??á?ª á?¨á??á?ªá??á??á??á?? á?¬á??á? á??á??á??á?¨á??á?? QR-á??á??á??á??á?¡ á??á??á?¦á??á??á??á?¡á??á?¡."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR-á??á??á??á?? á?¨á??á??á?ªá??á??á?¡ á??á?¥á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¡á??á??á??á? á??á?¡. á??á??á??á??á??á?¢á??á? á??á?? QR-á??á??á??á??á?¡ á?¬á??á??á??á??á??á?®á??á??á?? á??á??á?¡á??á??á??á? á??á??á?¡ á??á?¡á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á?? á?¢á??á??á??á?¤á??á??á?¡á?? á??á?? á?¡á?®á??á?? á??á??á?¬á?§á??á??á??á??á??á??á??á??á??á??."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "á??á??á??á??á??á??á?? á??á? á?ªá??á? á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á?? á??á? á??á?? á?®á??á??á??á??á?¡á??á?¬á??á??á??á??á??..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "á?¡á??á??á??á? á??á?£á??á??á??, á?¡á?¯á??á??á?¡ á?¡á?ªá??á??á??á?? %s á??á??á??á? á?£á??á??á??á?? %s á??á?? á??á??á? á?©á??á??á?? á?¡á?®á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "á??á??á??á??á?¯á?? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? %s Tor-á??á? á??á?£á??á??á? á?? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "á??á??á??á??á?¯á?? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "á??á??á??á?¦á??á?? %s á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "á??á??á??á??á?¯á?? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %s"
@@ -128,27 +144,27 @@ msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sá?£%sá??á? á??á??á??á?? á??á??á??á??á?ªá??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "á??á??á??á??á?¢á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "á??á? á??"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "á??á? á?ªá??á? á??á??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sá??%sá??á??á?®!"
@@ -156,69 +172,37 @@ msgstr "%sá??%sá??á??á?®!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sá??%sá??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á??á??á?? (Bridges)"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[á??á?¡ á??á??á?¢á??á??á??á?¢á?£á? á?? á?¬á??á? á??á??á??á??; á??á??á?®á??á??á?? á??á?£ á??á??á??á??á??á?®á??á??á?£á? á??á??á??á??.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[á??á?¡ á??á??á?¢á??á??á??á?¢á?£á? á?? á?¬á??á? á??á??á??á??.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "á??á?¥á??á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "á??á?¥á??á??á?? á??á??á??á??á??á?á??á? á??á??á?? á??á?¦á??á? á?£á?? á?¡á??á?®á?¨á??á? á??á?¡. á??á??á?®á??á??á??, á??á??á??á??á??á??á??á??á??á??á?? á?¡á?ªá??á??á??á??! á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á??á??á??á??á?? á?¨á??á??á??á?«á??á??á??á??á?? %s á?¡á??á??á??á??á?¡ á?¨á??á??á??á??á??. á?§á??á??á??á?? á?¬á??á? á??á??á?? á??á?? á?¨á?£á??á??á??á??á??á?¡ á??á??á??á??á??á??á??á??á??á??á?¨á??, á?£á??á?£á??á??á??á??á??á?§á??á?¤á??á??á?? á??á?¥á??á??á??á??."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (COMMANDs á??á? á??á??á??á??á??á??á?? á??á??á??á??á?§á??á??á??á??á??á?? á? á??á??á??á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á?¡ á??á? á??á??á? á??á?£á??á?? á??á??á??á??á??á??á??á??á?? á?¨á??á?¡á??á?«á??á??á??á??á??á??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á?? BridgeDB-á?¨á??!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "á??á??á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??á??á??á?? (TYPE):"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "á??á??á??á??á? á?¯á??á??á??, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á??, á??á??á??á??á??á??á? á??!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "á?¡á??á?¯á??á? á?? á??á??á?¡á??á?¦á??á??á??á??á??"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "á??á?¡ á?¬á??á? á??á??á?? á?¨á??á??á?¥á??á??á?? á?ªá??á?¡á??á? á?¢á?§á??á??á??á?¡ á?¤á??á? á??á??á??á??, á??á?¦á??á??á? á?£á??á?? á??á? á?¡á??á??á??á??á??á??á?? á??á?? á??á? á?á?§á??á??á??á??á??á??á??á??\n%s-á??á?¡á??á??á??á?¡, á??á??á? á??á?¦á?? %s, á??á? á?? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "á??á?¡ á?®á??á??á??á??á?? á??á?£ á??á?  á??á??á?¡á??á?á??á? á??á??á??á??á??, á??á??á??á??á??á??á??á??á??á??á?? á??á??á?¡á?£á?®á?? á??á?? á??á??á?¤á??á?¡á?¢á??á??á??\ná?¨á??á??á??á??á??á?? á??á? á?«á??á??á??á??á??á??á??á?? á?¬á??á? á??á??á??á?¡ á?¨á??á??á??á??á??á?¡á?¨á??:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
 msgstr "BridgeDB á??á??á??á??á??á??á??á??á?? á? á??á??á??á??á??á??á??á?? %sá?¡á??á?®á??á?¡ á??á??á?¡á??á??á? á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á?¡ (Pluggable Transports)%s,\ná? á??á??á??á??á??á?ª á??á??á??á??á?®á??á??á? á??á??á??á?? á??á??á??á??á??á??á?? á??á?¥á??á??á??á?? á??á??á??á?¨á??á? á??á??á?? Tor-á?¥á?¡á??á??á??á??á??, á??á?¡ á??á?? á??á??á?¢á??á??\ná??á??á?£á? á??á?£á??á??á??á?¡ á??á?¥á??á??á??á?? á?¥á?¡á??á??á??á?¡ á??á??á??á??á?§á?£á? á??á?¡á??á??á??á??á??á??á??á??á??á?¡ á?¨á??á?¡á??á?«á??á??á??á??á??á??á??á?¡,\ná??á??á??á??á??á??á??á??á??, á?®á??á? á?? á??á?£ á??á? á?? Tor-á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á?£á??á??.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,7 @@ msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¬á??á??á?? IPv
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
 "\n"
 msgstr "á??á??á??á?¡á??á??á??, BridgeDB-á?¡ á??á??á??á?©á??á??á?? á?£á??á??á? á??á??á?? á?©á??á??á?£á??á??á??á? á??á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?ª %sá?§á??á??á??á??á??á??á??á? á??\ná??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á?¡ (Pluggable Transports) á??á??á? á??á?¨á??, %s á? á??á?ª á??á? á?ª á??á?¡á?? á?¨á??á??á??á??á??á?á??á??á??á??á?? á??á??á??á??á??á??á?¥á??á??á?¡, á??á?£á??á?ªá?? á??á??á??á??á?ª á??á??á??á??á?¡á??á??á??á??á??á??\ná??á??á?¢á??á? á??á??á?¢á??á?¡ á?¨á??á??á?¦á?£á??á??á??á??á??á?¡á??á??á??á?¡ á??á??á??á??á?¡ á??á?¡á??á? á??á??á??á??á??á??á?? á??á? á??á??á? á?? á?¨á??á??á??á?®á??á??á??á??á?¨á??.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "á? á??á?¡ á?¬á??á? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á???"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s á?®á??á??á??á??á?? %s á??á? á??á?¡ Tor-á??á?¡ á??á??á??á??á??á?ªá??á??á??á??á??, á? á??á??á??á??á??á??á?ª á??á??á?®á??á??á? á??á??á??á?? á??á??á??á? á??á?? á??á?£á??á? á??á?? á?¨á??á??á?¦á?£á??á??á??á??á?¡."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "á?¡á?®á??á?? á??á??á??á??á?? á??á??á?¡á??á?á??á? á??á??á??á?? á??á??á??á??á??á?ªá??á?? á?®á??á??á??á??á??á??á?? á?¬á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "á??á??á??á??á?? á??á? á??á?? á?¡á??á?¨á?£á??á??á??á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??, á? á??á?? á??á??á??á??á??á??á??á??á?? á??á??á?¤á??á?¡á?¢á?? á??á??á?¡á??á??á??á? á??á??á?? %s. á??á??á?®á??á??á?? á??á??á??á??á??á??á??á??á?¡á?¬á??á??á??á??, á? á??á?? á?¬á??á? á??á??á?? á??á??á??á??á??á??á??á??á??á??á??á?? á?£á??á??á?? á??á?§á??á?¡ á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á? á??á??á??á??á??á??á?? á??á?? á??á??á??á?¬á??á??á??á??á??á??á?¡ á?¤á??á?¡á?¢á??á??á??á??:\n%s, %s á??á?? %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "á?®á??á??á??á??á??á?¡ á??á??á?¦á??á??á??á?¡ á??á??á??, á?¤á??á?¡á?¢á??á?? á??á??á?¬á??á? á??á?ªá??á?? á??á??á?¡á??á??á??á? á??á??á?? %s. á??á??á?¢á??á??á??á?? á??á??á??á??á?¡\ná??á??á??á?? á?ªá??á? á??á??á??á?? á??á?? á?©á??á?¬á??á? á??á?? â??get transport obfs4â?? á?¬á??á? á??á??á?¨á??, á??á??á??á??á??á??á??á??á?¡á?¬á??á??á??á??,\ná? á??á?? á??á??á??á??á??á??á??á??á??á?? á?¨á??á??á??á?«á??á??á??á?? á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á? á??á??á??á??á??á??á?? á??á??\ná??á??á??á?¬á??á??á??á??á??á??á?¡á??á??á??: %s á??á?? %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "á?©á??á??á?? á?®á??á??á??á??á?? á??á?  á??á?£á?¨á??á??á??á?¡! á??á??á?®á??á??á? á??á??á?? á??á?á??á? á??á??á??á??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á?£ á??á?¥á??á??á??á?? Tor á??á?  á??á?£á?¨á??á??á??á?¡, á??á??á??á??á??á??á??á??á??á??á?? á??á??á?¤á??á?¡á?¢á?? %s á??á??á?¡á??á??á??á? á??á??á??."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "á?¨á??á??á?ªá??á??á??á?? á??á??á?¢á??á?? á??á? á?ªá??á??á?? á??á?¦á?¬á??á? á??á?? á??á?¥á??á??á??á?? á?¨á??á??á??á?®á??á??á??á?? á??á?? á??á??á?£á? á??á??á?? á?¡á??á?? á??á??\ná??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡á?? á??á?? á??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á??á??á?¡ (Pluggable Transports) \ná? á??á??á??á??á?¡ á??á??á??á??á?§á??á??á??á??á??á?ª á?¡á?ªá??á??á??á??, á??á??á??á?¡á??á??á?? á??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á? á?¡á??á??, á?§á??á??á??á?? á?¨á??á?¢á?§á??á??á??á??á??á??á??, á? á??á?ª Tor-á??á?? á??á??á?©á??á??á??á??á?? á??á?? á??.á?¨."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "á??á?£ á??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á?? á??á??á?  á?£á??á??á??á?¨á??á? á??á??á??á??, á??á??á?®á??á??á?? á??á?®á??á??á??á?? %s á??á?? á?©á??á??á??á?? %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "á??á?¥ á??á? á??á?¡ á??á?¥á??á??á??á?? á?¡á??á?®á??á??á?? á?®á??á??á??á??á??:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "á??á??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "á?®á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á??á??"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 á??á??á? á??á??á??á?¡ á??á??á?® á?¡á??á?¨á?£á??á??á??á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á? á?ªá??á??á??á??á??á??á??: â??HTTPSâ??, â??Moatâ??,\nâ??Emailâ??, á??á?? â??Reservedâ??.  á?®á??á??á??á??á??, á? á??á??á??á??á??á??á?ª á??á?  á??á? á?ªá??á??á??á??á??á?? BridgeDB-á??á??, á??á?§á??á??á??á??á?¡\ná?ªá? á?£-á?¡á??á?¨á?£á??á??á??á??á??á?¡ â??Noneâ??.  á??á??á?ªá??á??á?£á??á?? á?©á??á??á??á??á??á??á??á??á??á?? á??á??á? á?¢á??á??á??á?? á?®á?¡á??á??á?¡ á??á?£ á? á??á??á??á? \ná??á?£á?¨á??á??á??á?¡ á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á??á??, á?©á??á??á??á?? %sBridgeDB-á??á??á??á??á??á??á??á??á??%s á??á?? á??á?¡á??á?®á??á??á?¡ á? á?? á?¡á??á?®á?¨á??á? á??á?? á??á??á??á??á??á?§á??á??á??á??á??\ná??á??á??á??á??á?£á??á?? á??á??á??á??á??á??á??."
+
+#: bridgedb/strings.py:115
+#, 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 "â??HTTPSâ?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á?? á??á??á??á??á?¡á?ªá??á??á?¡ á?®á??á??á??á??á?¡ á??á??á??á?¡á??á??á?¢á??á??á??á??.  á?®á??á??á??á??á??á?¡\ná??á??á?¡á??á?¦á??á??á??á??, á??á??á?®á?¡á??á??á??á?? %sbridges.torproject.org%s, á??á??á? á?©á??á??á?? á?¡á??á?¡á?£á? á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á?? á??á?? \ná?¨á??á??á??á??á??á?? á??á??á??á?®á?¡á??á??á??á?? CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, 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 "â??Moatâ?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??, á??á??á?¬á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡, á??á??á?¡á??á?? á??á??á??á?®á??á??á? á??á??á??á??á??á?¡ \ná?¨á??á?£á?«á??á??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á??á??á??á??á??.  á?®á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??, á??á??á?®á?¡á??á??á??á??\ná??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %sTor-á??á??á? á??á??á??á?¢á? á??á??á??%s, á??á??á?¬á??á??á??á??á?? â??á??á?®á??á??á?? á?®á??á??á??á?¡ á??á??á??á?®á??á??á??á??â??, á??á??á??á?®á?¡á??á??á??á??\ná??á??á?ªá??á??á?£á??á?? CAPTCHA á??á?? Tor-á??á? á??á?£á??á??á? á?? á??á??á??á??á?? á??á??á??á??á??á?¢á??á??á?¡ á??á?¥á??á??á??á?¡ á??á?®á??á??\ná?®á??á??á??á??á?¡."
+
+#: bridgedb/strings.py:125
+#, 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 "á??á??á??á?®á??á??á? á??á??á??á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á?? â??á??á??á?¤á??á?¡á?¢á??á?¡â?? á??á??á??á??á??á??á??á??á??á??á??á??á?ª á?¨á??á?£á?«á??á??á??á??\ná??á??á?¡á??á??á??á? á??á??á?? %sbridges@xxxxxxxxxxxxxx%s á??á?? â??get transport obfs4â?? á?¢á??á?¥á?¡á?¢á??á?¡ á??á??á? á??á??á??á??\ná?¬á??á? á??á??á??á?¡ á?¨á??á??á??á??á??á?¡á?¨á??."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "á?¡á??á??á??á??á??á? á??á??á??"
+
+#: bridgedb/strings.py:130
+#, 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 á?£á??á? á?£á??á??á??á??á?§á??á?¤á?¡ á??á?ªá??á? á?? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á?¡, á? á??á??á??á??á??á??á?ª á??á?  á??á? á?ªá??á??á??á??á??á??\ná??á??á?¢á??á??á??á?¢á?£á? á??á??.  á??á?¡á??á??á?? á??á??á??á?®á??á??á?? á?¡á??á??á??á??á??á? á??á??á??á?? á?®á??á??á??á?? á??á??á??á? á?ªá??á??á??á??á??á?¡á??á??á??á?¡\ná??á?? á??á??á??á??á?¡á??á?ªá??á??á??á?? NGO-á??á??á??á?¡á?? á??á?? á?¡á?®á??á?? á??á??á?¬á??á?¡á??á??á?£á??á??á??á??á??á??á?¡ á??á?? á??á??á? á??á??á??á?¡á??á??á??á?¡, á? á??á??á??á??á??á??á?ª\ná?®á??á??á??á??á?¡ á?¡á??á?á??á? á??á??á??á??á??.  á?®á??á??á??á??á?? á? á??á??á??á??á??á??á?ª á??á? á?ªá??á??á??á??á??á?? â??á?¡á??á??á??á??á??á? á??á??á??á??â??, á?¨á??á?¡á??á?«á??á??á?? á??á? \ná?©á??á??á??á??á?¡ á??á??á??á?®á??á??á? á??á??á??á??á??á??á?¡á??á??á??á?¡.  á?¨á??á??á??á?¨á??á??á??: â??á?¡á??á??á??á??á??á? á??á??á??â?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á?¡ \ná??á?¬á??á??á??á??á?? â??Unallocatedâ?? %sá??á??á?¡
 á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á? á??á??á??á?¡%s á?¤á??á??á??á??á??á?¨á??."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "á??á? á??"
+
+#: bridgedb/strings.py:138
+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 "á?®á??á??á??á??á??, á? á??á??á??á??á??á?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á?? â??Noneâ??, á??á?  á??á??á??á?ªá??á??á?? BridgeDB-á??á??.\ná??á??á??á??á?? á?®á??á??á??á?¡ á??á?¤á??á??á??á??á??á??á??á??á?¡ á??á??á?¡á?£á?®á??á?¡á??á??á??á??á??á??á??á??á??, á??á??á??á?? á??á??á??á?®á??á??á? á??á??á??á??á??á??á?¡á??á??á??á?¡\ná??á??á?¬á??á??á??á??á??.  á?¨á??á??á??á?¨á??á??á??: á??á??á??á??á??á?ªá??á??á??á?? á?«á??á??á??á??á?¡á??á?¡, á??á?®á??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡\ná?¡á??á?¨á?£á??á??á??á??á??á?? á??á?¦á??á??á?¨á??á?£á??á??á?? â??Noneâ??, á??á??á??á?®á??á??á??á??á??á?? á??á? á??á?? á??á?¦á??.  á??á??á?®á??á??á??, á??á??á??á??á??á??á??á??á??,\ná?¡á??á??á??á?? á?¨á??á??á?ªá??á??á??á??á?? á??á?? á??á??á??á??á??á??á??á??á?? á?®á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¨á??á?¡á??á??á??á??á??á?¡á?? á?¡á??á?¨á?£á??á??á??á??á??.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "á??á??á?®á??á??á??, á??á??á?£á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? IPv6-á??á??á?¡á??á??á??á? á??á??á??á???"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "á??á?¥á??á??á??á?? á??á? á??á?£á??á??á? á?? á??á?  á??á?©á??á??á??á??á??á?¡ á?¡á?£á? á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "á?¨á??á??á?§á??á??á??á??á?? á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á?? á??á? á?¡á??á??á?£á??á?? á?¡á?£á? á??á??á??á??á??á??..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "á? á??á??á??á?  á?£á??á??á?? á??á??á??á??á??á??á?§á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á?¨á??á?¡á??á?§á??á??á??á??á??, á??á??á??á??á??á??á??á? á??á??á??á??á?? á??á??á??á??á??á??á?? %sTor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡\ná??á??á??á? á??á??á?? %s á??á?? á?¨á??á??á??á??á?? á??á??á?§á??á??á??á?? á??á?¥ á??á??á?ªá??á??á?£á?? á??á??á??á??á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡á?? á??á??\ná??á??á?¨á??á??á??á??á?¡ á??á??á??á??á??á??á??."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " á??á??á? á??á??á?? á? á??á??á?¨á??, á?¡á??á?á??á? á??á?? %sá??á??á??á??á??á?¬á??á? á??á?? Tor-á??á? á??á?£á??á??á? á??%s. Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á??á?®á??á??á? á??á??á??á??á?¡\n á?¡á??á?®á??á??á??á?«á?¦á??á??á??á??á??á??á?¨á?? á??á?®á??á??á??á??á??, á? á??á??á??á?  á?£á??á??á?? á??á??á??á??á??á?¢á??á?? á?®á??á??á?? Tor-á??á? á??á?£á??á??á? á?¡. á??á?£\n á??á??á?§á??á??á??á??á?? Windows, Linux, á??á?? OS X, %sá??á??á?¬á??á??á??á??á?? á??á?¥%s á??á? á?ªá??á??á?? á?¡á??á??á??á?®á??á??á??á??. á??á?£ \n á??á??á?¥á??á?? Android, %sá??á??á?¬á??á??á??á??á?? á??á?¥%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "á? á??á??á??á?¡á??á?ª â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á?¤á??á??á?¯á??á? á?? á??á??á??á??á?©á??á??á??á??á??, á??á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á? á??á??á??á?¡â?? á??á?? á??á??á?°á?§á??á??á??á??\ná??á??á??á??á?£á? á?¡ á?¨á??á??á??á??á?? á?¨á??á??á??á??á?®á??á??á??á??á??:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "á??á?? á?®á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á??á??á?¡á??á??á??á?¢á??á??á??á??á?? á??á??á?®á?¡á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??\ná??á??á?¬á??á??á??á??á?? â??Torâ??  á??á?? á?¨á??á??á??á??á?? á??á?? á??á??á??á??á??á?¢á??á?? â??á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡\ná??á??á??á??á??á??á??á??á?¡â?? á??á??á??á??á??."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "á??á?¥á??á??á??á?? á??á??á?¢á??á? á??á??á?¢-á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á??á??á??á?¬á??á??á??á??á??á??á?? (ISP) á??á? á?«á??á??á??á??á?¡ á??á?? á? á??á??á??á??á??á??á? á??á??\ná??á?¦á?£á??á??á??á?¡ Tor-á?¥á?¡á??á??á??á??á?? á??á??á??á?¨á??á? á?¡?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? á?¨á??á?£á??á??á?¦á??á??á??á?? Tor-á?®á??á??á??á??á??á?¡.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "á??á??á?£á??á??á??á??á?? â??á??á??á??á?®â?? á??á?? á?¨á??á??á??á??á?? á??á??á?¬á??á??á??á??á?? â??á?¨á??á??á??á??á??â??. á??á?¥á??á??á??á?? á??á?®á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??, á??á??á?¦á??á?? á??á?¡á??á?? á??á??\ná?©á??á?¡á??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á?? á?¢á??á?¥á?¡á?¢á??á?¡ á?¨á??á?¡á??á?§á??á??á?? á??á??á??á?¨á??. á??á??á??á??á?¡ á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á??á?¨á??á? á??á??á??â?? á??á??\ná?¬á??á?¡á??á?? á?§á??á??á??á??á?¤á??á? á?? á??á??á?£á?¨á??á??á??á??á?¡! á??á?£ á? á??á??á?? á??á??á??á? á??á??á??á??á??á??á?¡ á??á??á??á??á??á?¬á?§á??á??á??á??á??, á?¡á?ªá??á??á??á?? â??á??á??á?®á??á??á? á??á??á??á?¡â?? á?¦á??á??á??á??á??á??\ná??á??á?¬á??á??á??á??á??á?? â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á??á??á??á??á?£á? á?¨á??, á??á??á??á??á?¢á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á?¡ á??á??á?¡á??á?¦á??á??á??á??."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "á??á?? á?¨á??á?¢á?§á??á??á??á??á??á??á??á?¡ á?©á??á??á??á??á??á??."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "á?©á??á??á?£á??á??á??á? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6-á??á??á?¡á??á??á??á? á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "á??á??á?¡á??á??á? á??á??á??á??á??á?? TYPE-á??á??á??á??á??á?§á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
+msgid "(Request IPv6 bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? IPv6-á?®á??á??á??á??á??á?¡.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB-á?¡ á?¡á??á??á?¯á??á? á?? GnuPG-á??á??á?¡á??á?¦á??á??á??á?¡ á??á??á?¦á??á??á??."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? á?¨á??á??á??á?¦á??á?£á??á?? obfs4-á?®á??á??á??á??á??á?¡.)"
diff --git a/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
index f9ddedf..b861bbd 100644
--- a/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,140 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>, 2019
+# Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>, 2019-2020
 # Gabit Aidarbek <agabit@xxxxxxxxx>, 2014
 # Nurlan Rakhimzhanov <nurlan.rakhimzhanov@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-20 18:32+0000\n"
-"Last-Translator: Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?ÐµÑ?Ñ?Ñ?Ñ?Ò£Ñ?Ð·, Ñ?Ñ?Ð·Ð´Ñ?Ò£ Ñ?Ò±Ñ?Ð°Ð½Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±ÐµÐ»Ð³Ñ?Ñ?Ñ?Ð· Ò?Ð¸Ñ?Ð½Ñ?Ñ?Ð»Ñ?Ò?Ñ?Ð°Ñ? Ð±Ð°Ñ?. "
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð¢Ñ?Ð»"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ò?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ð»Ñ? Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¿Ò?Ñ? ÐºÐ¾Ð´Ñ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ó¨Ð·Ð³ÐµÑ?Ñ?Ñ?Ñ?ÐµÑ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð·"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR ÐºÐ¾Ð´Ñ?Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð· Ò¯Ñ?Ñ?Ð½ QR ÐºÐ¾Ð´Ñ?"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð£Ñ?Ñ?,Ñ?Ð¿Ð°Ð³ÐµÑ?Ñ?Ð¸!\nÐ?Ð°Ñ?Ð³Ð¾Ð½ Ñ?Ó©Ð·."
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ QR ÐºÐ¾Ð´Ñ?Ñ? Ð°Ð»Ò?Ð°Ð½ ÐºÐµÐ·Ð´Ðµ Ò?Ð°Ñ?ÐµÐ»Ñ?Ðº Ð±Ð¾Ð»Ò?Ð°Ð½ Ñ?Ð¸Ñ?Ò?Ñ?Ñ?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ò±Ð» QRCode Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ð½ Ò?Ð°Ð¼Ñ?Ð¸Ð´Ñ?. Ð?Ó©Ñ?Ñ?Ñ?Ð¼Ðµ Ð¶Ð¾Ð»Ð´Ð°Ñ?Ð´Ñ? Ò±Ñ?Ð»Ñ? Ð¶Ó?Ð½Ðµ Ð±Ð°Ñ?Ò?Ð° Ò?Ò±Ñ?Ñ?Ð»Ò?Ñ?Ð»Ð°Ñ?Ò?Ð° ÐºÓ©Ñ?Ñ?Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ Ð¾Ð½Ñ? QRCode Ð¾Ò?Ñ?Ñ?Ð¼Ð°Ð½Ñ?Ð¼ÐµÐ½ Ñ?ÐºÐ°Ð½ÐµÑ?Ð»ÐµÒ£Ñ?Ð·."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð½Ð´Ð° Ò?Ð°Ð·Ñ?Ñ?Ð³Ñ? ÐºÐµÐ·Ð´Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶Ð¾Ò? ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ò¯Ð¼ÐºÑ?Ð½ Ñ?Ñ?Ð· %sÒ?Ð°Ð¹Ñ?Ð°Ð´Ð°Ð½ Ð±Ð°Ñ?Ñ?Ò?Ð° %sÐ¶Ó?Ð½Ðµ Ð±Ð°Ñ?Ò?Ð° ÐºÓ©Ð¿Ñ?Ñ? Ñ?Ò¯Ñ?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ñ?Ò?Ð° Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð· ÐºÐµÑ?ÐµÐº!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s Ð¶Ò¯ÐºÑ?ÐµÑ?"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? %s Ð°Ð»Ñ?"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð?Ð½Ð´Ñ? %s Tor Brouser-Ð³Ðµ  ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ñ? %s"
@@ -128,27 +143,27 @@ msgstr "Ð?Ð½Ð´Ñ? %s Tor Brouser-Ð³Ðµ  ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ñ? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¼Ð°Ò?Ð°Ð½ Ð±ÐµÑ?Ñ?Ò£Ñ?Ð·! "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð¢Ð¾Ð»Ñ?Ò? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ð¾Ò?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð?Ð¾Ò?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses! "
@@ -156,69 +171,37 @@ msgstr "%sY%ses! "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Ð?Ó©Ð¿Ñ?Ñ? "
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ò±Ð» Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ò¯Ñ?Ð´ÐµÐ³Ñ? Ñ?Ð°Ñ?, Ð±Ò±Ò?Ð°Ð½ Ð¶Ð°Ñ?Ð°Ð¿ Ð±ÐµÑ?Ð¼ÐµÑ?Ñ?Ò£Ñ?Ð·Ð´Ñ? Ñ?Ò±Ñ?Ð°Ð¹Ð¼Ñ?Ð·.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ñ?Ð½Ð´Ð° Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð¡Ñ?Ð· Ð¶Ñ?Ð»Ð´Ð°Ð¼Ð´Ñ?Ò? Ñ?ÐµÐ³Ñ?Ð½ÐµÐ½ Ð°Ñ?Ñ?Ð¿ ÐºÐµÑ?Ñ?Ñ?Ò£Ñ?Ð·. Ó¨Ñ?Ñ?Ð½ÐµÐ¼Ñ?Ð·, Ð¶Ñ?Ð»Ð´Ð°Ð¼Ð´Ñ?Ò?Ñ?Ñ? Ð°Ð·Ð°Ð¹Ñ?Ñ?Ò£Ñ?Ð·! Ð¥Ð°Ñ?Ñ?Ð°Ñ?Ð´Ñ?Ò£ Ð°Ñ?Ð°Ð»Ñ?Ò?Ñ?Ð½Ð´Ð°Ò?Ñ? ÐµÒ£ Ò?Ñ?Ñ?Ò?Ð° Ñ?Ð°Ò?Ñ?Ñ? %s Ñ?Ð°Ð¼Ð°Ð½Ñ? Ò?Ò±Ñ?Ð°Ð¹Ð´Ñ?. Ð¡Ð¾Ð» Ñ?Ð°Ò?Ñ?Ñ? Ð°Ñ?Ð°Ð»Ñ?Ò?Ñ?Ð½Ð´Ð°Ò?Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ñ?Ð´Ñ?Ò£ Ð±Ð°Ñ?Ð»Ñ?Ò?Ñ? ÐµÐ»ÐµÐ½Ð±ÐµÐ¹Ð´Ñ?. "
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: Ð±Ñ?Ñ?Ð½ÐµÑ?Ðµ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?Ñ?Ð°Ñ?Ð´Ñ? Ò?Ð°Ñ?Ð°Ñ? Ñ?Ð°Ò£Ð´Ð°Ñ? Ò¯Ñ?Ñ?Ð½ ÐºÐ¾Ð¼Ð¼Ð°Ð½Ð´Ð°Ð»Ð°Ñ?Ð´Ñ? Ð±Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ñ?, "
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-Ð³Ðµ Ò?Ð¾Ñ? ÐºÐµÐ»Ð´Ñ?Ò£Ñ?Ð·!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ò?Ð°Ð·Ñ?Ñ?Ð³Ñ? ÐºÐµÐ·Ð´Ðµ Ò?Ð¾Ð»Ð´Ð°Ñ?Ð´Ð° ÐºÐµÐ»ÐµÑ?Ñ? TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ó?Ð¹, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð¡Ó?Ð»ÐµÐ¼, Ð´Ð¾Ñ?Ñ?Ð¼!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ñ?Ñ?Ò? ÐºÑ?Ð»Ñ?Ñ?ÐµÑ?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?Ò±Ð» Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ? Ð¿Ð¾Ñ?Ñ?Ð° Ð¶Ð°Ò£Ð±Ñ?Ñ?, Ð¶Ð°Ð»Ð°Ò£Ð°Ñ?Ñ?Ð°Ð½Ò?Ð°Ð½ Ð¶Ó?Ð½Ðµ Ð¶Ð°Ñ?Ò?Ñ?Ñ?Ð°Ò?Ð°Ð½Ð´Ð°Ñ?Ð¼ÐµÐ½ Ð¶Ð°Ñ?Ð°Ð»Ð´Ñ?\nÐ°Ñ?Ð½Ð°Ð»Ò?Ð°Ð½ %sat%s at%s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
 msgstr "BridgeDB Pluggable Transports Ð±Ñ?Ñ?Ð½ÐµÑ?Ðµ %sÑ?Ò¯Ñ?Ñ?Ð¼ÐµÐ½ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð°Ð¼Ñ?Ð°Ð¼Ð°Ñ?Ñ?Ð· ÐµÑ?ÐµÐ´Ñ?%s,\nÐ±Ò±Ð» Tor Networ Ò?Ð¾Ñ?Ñ?Ð»Ñ?Ð»Ð°Ñ?Ñ?Ò£Ñ?Ð·Ò?Ð° ÐºÐµÐ´ÐµÑ?Ð³Ñ? ÐºÐµÐ»Ñ?Ñ?Ñ?Ðµ Ð°Ð»Ð°Ð´Ñ?, Ð¼Ò±Ð½Ñ? ÐºÓ©Ð±Ñ?Ñ?ÐµÐº ÐµÑ?ÐµÐ´Ñ?\nÐ¡Ñ?Ð· Ó©Ð·Ñ?Ò£Ñ?Ð·Ð´Ñ?Ò£ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ñ?Ð°Ñ?Ð¸ÐºÑ?Ò£Ñ?Ð·Ð´Ñ? Ò?Ð°Ð´Ð°Ò?Ð°Ð»Ð°Ð¿ Ð¾Ñ?Ñ?Ñ?Ò?Ð°Ð½Ñ?Ò£Ñ?Ð·Ð´Ñ? Ð°Ð½Ñ?Ò?Ñ?Ð°Ñ? Ò¯Ñ?Ñ?Ð½ Ò?Ð¸Ñ?Ð½\nTor Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,7 @@ msgstr "Ð?ÐµÐ¹Ð±Ñ?Ñ?ÐµÑ?Ð»ÐµÑ?Ñ?Ð½Ðµ Ò?Ð°Ñ?Ð°Ð¼Ð°Ñ?Ñ?Ð°Ð½, IPv6 Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
 "\n"
 msgstr "Ð¡Ð¾Ð½Ñ?Ð¼ÐµÐ½ Ò?Ð°Ñ?Ð°Ñ?, BridgeDB-Ð´Ðµ ÐºÓ©Ð¿Ñ?ÐµÐ³ÐµÐ½ plain-ol'-vanilla ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?%s  Pluggable Transports %sÐ¾Ð»Ð°Ñ? Ð¼Ò¯Ð¼ÐºÑ?Ð½ ÐºÒ¯Ñ?Ñ?Ñ? ÐµÐ¼ÐµÑ?, Ð±Ñ?Ñ?Ð°Ò? Ð¾Ð»Ð°Ñ? \nÐºÓ©Ð¿Ñ?ÐµÐ³ÐµÐ½ Ð¶Ð°Ò?Ð´Ð°Ð¹Ð»Ð°Ñ?Ð´Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ð½Ñ? Ð°Ð¹Ð½Ð°Ð»Ñ?Ð¿ Ó©Ñ?Ñ?Ð³Ðµ ÐºÓ©Ð¼ÐµÐºÑ?ÐµÑ?ÐµÐ´Ñ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð´ÐµÐ³ÐµÐ½Ñ?Ð¼Ñ?Ð· Ð½Ðµ?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%sÐ?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? %s Tor Ñ?ÐµÐ»ÐµÑ?Ñ?, Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ð½Ñ? Ð°Ð¹Ð½Ð°Ð»Ñ?Ð¿ Ó©Ñ?Ñ?Ð³Ðµ ÐºÓ©Ð¼ÐµÐºÑ?ÐµÑ?ÐµÐ´Ñ?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ð¼Ð°Ò?Ð°Ð½ Ð±Ð°Ñ?Ò?Ð° Ð¶Ð¾Ð»Ñ? ÐºÐµÑ?ÐµÐº!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ñ?Ð°Ò?Ñ? Ð±Ñ?Ñ? Ð¶Ð¾Ð»Ñ? - Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ò?Ð° Ð¶Ñ?Ð±ÐµÑ?Ñ?%s.Ð?Ð°Ð·Ð°Ñ? Ð°Ñ?Ð´Ð°Ñ?Ñ?Ò£Ñ?Ð·, Ñ?Ñ?Ð·Ð³Ðµ ÐºÐµÑ?ÐµÐº\nÑ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ? Ñ?Ó©Ð¼ÐµÐ½Ð´ÐµÐ³Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ð»ÐµÑ?Ñ?Ð½Ñ?Ò£ Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ò£ Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ?Ð½Ð°Ð½ Ð¶Ñ?Ð±ÐµÑ?Ñ?Ò£Ñ?Ð·:%s,%s Ð½ÐµÐ¼ÐµÑ?Ðµ%s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ñ?Ð°Ò?Ñ? Ð±Ñ?Ñ? Ñ?Ó?Ñ?Ñ?Ð»Ñ? - Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ? Ð¶Ñ?Ð±ÐµÑ?Ñ?%s.ÐÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ò£ Ñ?Ð°Ò?Ñ?Ñ?Ñ?Ð±Ñ?Ð½ Ð±Ð¾Ñ? Ò?Ð°Ð»Ñ?Ð´Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ Ñ?Ð»ÐµÐºÑ?Ð¾Ñ?Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ð¼Ð°Ñ?Ñ?Ð½Ñ?Ò£ Ð½ÐµÐ³Ñ?Ð·Ð³Ñ? Ð¼Ó?Ñ?Ñ?Ð½Ñ?Ð½Ðµ \"get transport obfs4\" Ð´ÐµÐ¿ Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð·.ÐÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ? ÐºÐµÐ»ÐµÑ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ð¶ÐµÑ?ÐºÑ?Ð·Ñ?Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð½Ñ?Ò£ Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ò£ Ð¼ÐµÐºÐµÐ½-Ð¶Ð°Ð¹Ñ? Ð°Ñ?Ò?Ñ?Ð»Ñ? Ð¶Ñ?Ð±ÐµÑ?Ñ?Ñ?Ò£Ñ?Ð· ÐºÐµÑ?ÐµÐº:%sÐ½ÐµÐ¼ÐµÑ?Ðµ%s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?ÐµÐ½Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð¼ Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¼ÐµÐ¹Ð´Ñ?! Ð?Ó©Ð¼ÐµÐº Ò?Ð°Ð¶ÐµÑ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ñ?Ò£ Tor Ð¶ÐµÐ»Ñ?Ò£Ñ?Ð· Ñ?Ñ?Ñ?ÐµÐ¼ÐµÑ?Ðµ,Ð¼Ñ?Ð½Ð° email-Ò?Ð° Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð· %s. "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ó¨Ð·Ñ?Ò£Ñ?Ð·Ð´Ñ?Ò£ Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ñ?Ñ?Ñ?Ð°Ð»Ñ?, Ñ?Ð¾Ð½Ñ?Ò£ Ñ?Ñ?Ñ?Ð½Ð´Ðµ, Ñ?Ñ?Ð·Ñ?Ð¼Ñ?Ð½ Ò?Ð¾Ñ?Ñ?Ð¿ ÐºÓ©Ñ?Ñ?Ò£Ñ?Ð·\nÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¶Ó?Ð½Ðµ Pluggable Transports-Ñ?Ñ? Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ò?Ñ?Ò£Ñ?Ð· ÐºÐµÐ»Ð³ÐµÐ½, Tor Browser Ð½Ò±Ñ?Ò?Ð°Ñ?Ñ?Ð½,\nÐ¶Ó?Ð½Ðµ Tor Ð±ÐµÑ?Ð³ÐµÐ½ Ð±Ð°Ñ?Ð»Ñ?Ò? Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ? Ð¶Ó?Ð½Ðµ Ñ?.Ð±."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ñ?Ò£ Tor Browser-Ñ?Ò£Ñ?Ð· Ò?Ð¾Ñ?Ñ?Ð»Ð° Ð°Ð»Ð¼Ð°Ñ?Ð°,Ð±Ñ?Ð·Ð±ÐµÐ½ %sÑ?Ð°Ð½Ñ?Ñ?Ñ?Ñ?Ò£Ñ?Ð·Ð´Ñ?%s Ó©Ñ?Ñ?Ð½ÐµÐ¼Ñ?Ð·."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ðµ Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ò£Ñ?Ð·!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð´ÐµÑ?Ñ?."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ?Ð´Ñ?Ò£ Ñ?Ó©Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼Ñ?Ð½ Ò?Ð¾Ð»Ð´Ð°Ð½Ð°Ð´Ñ?: \"HTTPS\", \"Moat\", \"Email\" Ð¶Ó?Ð½Ðµ \"Reserved\". BridgeDB Ð°Ñ?Ò?Ñ?Ð»Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ?Ð»Ð¼Ð°Ò?Ð°Ð½ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ðµ Â«Ð?Ð¾Ò?Â» Ð¶Ð°Ð»Ò?Ð°Ð½ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ò?Ð¾Ð»Ð´Ð°Ð½Ñ?Ð»Ð°Ð´Ñ?.Ð¢Ó©Ð¼ÐµÐ½Ð´ÐµÐ³Ñ? Ñ?Ñ?Ð·Ñ?Ð¼ Ð¼Ò±Ð½Ñ?Ò£ Ò?Ð°Ð»Ð°Ð¹ Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¹Ñ?Ñ?Ð½Ñ?Ð½ Ñ?Ò¯Ñ?Ñ?Ð½Ð´Ñ?Ñ?ÐµÐ´Ñ? Ð¶Ó?Ð½Ðµ Ð±Ñ?Ð·Ð´Ñ?Ò£ %sBridgeDB Ó©Ð»Ñ?ÐµÐ¼Ð´ÐµÑ?Ñ?Ð¼Ñ?Ð·%s Ó?Ñ?Ò?Ð°Ð¹Ñ?Ñ?Ñ?Ñ?Ð½Ñ?Ò£ Ò?Ð°Ð½Ñ?Ð°Ð»Ñ?Ò?Ñ?Ñ? Ñ?Ð°Ð½Ñ?Ð¼Ð°Ð» ÐµÐºÐµÐ½Ñ?Ð½ ÐºÓ©Ñ?Ñ?ÐµÑ?ÐµÐ´Ñ?."
+
+#: bridgedb/strings.py:115
+#, 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 "Â«HTTPSÂ» Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ð¾Ñ?Ñ? Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ? Ð°Ñ?Ò?Ñ?Ð»Ñ? ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ñ?Ð°Ñ?Ð°Ñ?Ð°Ð´Ñ?.Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ? Ò¯Ñ?Ñ?Ð½, %sbridges.torproject.org%s Ñ?Ð°Ð¹Ñ?Ñ?Ð½Ð° Ó©Ñ?Ñ?Ð¿, Ó©Ð·Ñ?Ò£Ñ?Ð· Ò?Ð°Ð»Ð°Ò?Ð°Ð½ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ\nÐºÐµÐ»ÐµÑ?Ñ? CAPTCHA-Ð½Ñ? Ñ?ÐµÑ?Ñ?Ò£Ñ?Ð·."
+
+#: bridgedb/strings.py:119
+#, 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 "\"Moat\" Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? TorBrowser-Ð´Ñ?Ò£ Ð±Ó©Ð»Ñ?Ð³Ñ?, Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ñ?Ñ?Ð»Ð°Ñ?Ò?Ð° Tor Browser Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ñ?Ð½Ñ?Ò£ Ñ?Ñ?Ñ?Ð½ÐµÐ½ ÐºÓ©Ð¿Ñ?Ñ? Ñ?Ò±Ñ?Ð°Ñ?Ò?Ð° Ð¼Ò¯Ð¼ÐºÑ?Ð½Ð´Ñ?Ðº Ð±ÐµÑ?ÐµÐ´Ñ?.Ð?Ó©Ð¿Ñ?Ñ?Ð´Ñ? Ð°Ð»Ñ? Ò¯Ñ?Ñ?Ð½, Ñ?Ñ?Ð·Ð´Ñ?Ò£ Tor Browser-Ñ?Ò£Ñ?Ð·Ð´ÐµÐ³Ñ? %sTor Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ñ?Ð½Ðµ%s ÐºÑ?Ñ?Ñ?Ò£Ñ?Ð·, \"Ð¶Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ? Ñ?Ò±Ñ?Ð°Ñ?\" Ð±Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·,ÐºÐµÐ»ÐµÑ?Ñ? CAPTCHA-Ð½Ñ? Ñ?ÐµÑ?Ñ?Ò£Ñ?Ð·, Ð¶Ó?Ð½Ðµ Tor Browser Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ò¯Ñ?Ð´Ðµ Ð¶Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ð°Ð´Ñ?"
+
+#: bridgedb/strings.py:125
+#, 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 "\"Email\" Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼Ñ?Ð½ Ò?Ð¾Ð»Ð´Ð°Ð½Ð°Ñ?Ñ?Ð½ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ñ?Ñ?Ð»Ð°Ñ? %sbridges@xxxxxxxxxxxxxx%s Ð¼ÐµÐºÐµÐ½ Ð¶Ð°Ð¹Ñ?Ð½Ð° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ? Ð¶Ñ?Ð±ÐµÑ?Ñ? Ð°Ñ?Ò?Ñ?Ð»Ñ? Ð¶Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ? Ñ?Ò±Ñ?Ð°Ð¹ Ð°Ð»Ð°Ð´Ñ? Ð¶Ó?Ð½Ðµ Ñ?Ð°Ð±Ð°Ñ?Ð°Ð»Ð¼Ð° Ð¼Ó?Ñ?Ñ?Ð½Ñ?Ð½Ðµ \"get transport obfs4\" Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð·."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Ð¡Ð°Ò?Ñ?Ð°Ð»Ò?Ð°Ð½"
+
+#: bridgedb/strings.py:130
+#, 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 Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ò¯Ñ?Ð´Ðµ Ñ?Ð°Ñ?Ð°Ñ?Ñ?Ð»Ð¼Ð°Ð¹Ñ?Ñ?Ð½ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ?Ò£ Ð°Ð· Ð±Ó©Ð»Ñ?Ð³Ñ?Ð½ Ò±Ñ?Ñ?Ð°Ð¹Ð´Ñ?.Ð?Ð½Ñ?Ò£ Ð¾Ñ?Ð½Ñ?Ð½Ð° Ð±Ñ?Ð· Ð±Ò±Ð» ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ð»Ð¼ÐµÐ½ Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ Ñ?ÐµÐ·ÐµÑ?Ð²Ñ?Ðµ Ñ?Ð°Ò?Ñ?Ð°Ð¿, Ð¾Ð»Ð°Ñ?Ð´Ñ? ÐºÓ©Ð¿Ñ?Ñ?Ð³Ðµ Ð¼Ò±Ò?Ñ?Ð°Ð¶ Ò¯ÐºÑ?Ð¼ÐµÑ?Ñ?Ðº ÐµÐ¼ÐµÑ? Ò±Ð¹Ñ?Ð¼Ð´Ð°Ñ?Ò?Ð° Ð¶Ó?Ð½Ðµ Ð±Ð°Ñ?Ò?Ð° Ò±Ð¹Ñ?Ð¼Ð´Ð°Ñ? Ð¼ÐµÐ½ Ð¶ÐµÐºÐµ Ð°Ð´Ð°Ð¼Ð´Ð°Ñ?Ò?Ð° Ñ?Ð°Ð±Ñ?Ñ?Ñ?Ð°Ð¹Ð¼Ñ?Ð·.\"Reserved\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ð°Ñ?Ò?Ñ?Ð»Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ?Ð»Ð°Ñ?Ñ?Ð½ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ñ?Ñ?Ð»Ð°Ñ?Ð´Ñ? Ò±Ð·Ð°Ò? Ñ?Ð°Ò?Ñ?Ñ? ÐºÓ©Ñ?Ðµ Ð°Ð»Ð¼Ð°Ñ?Ñ? Ð¼Ò¯Ð¼ÐºÑ?Ð½.\"Reserved\" Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? %sÐºÓ©Ð¿Ñ?Ñ? Ð¿Ñ?Ð»Ñ?Ð½ Ñ?Ð°Ò?Ð°Ð¹Ñ?Ð½Ð´Ð°Ñ?%s Ñ?Ð°Ð¹Ð»Ð´Ð°Ñ?Ñ?Ð½Ð´Ð° \"Unallocated\" Ð´ÐµÐ¿ Ð°Ñ?Ð°Ð»Ð°Ñ?Ñ?Ð½Ñ?Ð½ ÐµÑ?ÐºÐµÑ?Ñ?Ò£Ñ?Ð·."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?Ñ?Ò?Ð°Ð¹Ñ?Ñ?Ñ?Ñ? Ð¶Ð¾Ò?"
+
+#: bridgedb/strings.py:138
+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 "Ð¢Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? \"None\" Ð±Ð¾Ð»Ñ?Ð¿ Ñ?Ð°Ð±Ñ?Ð»Ð°Ñ?Ñ?Ð½ ÐºÓ©Ð¿Ñ?Ñ? BridgeDB Ñ?Ð°Ñ?Ð°Ñ?Ð¿Ð°Ð¹Ð´Ñ?.Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ñ?Ñ?Ð»Ð°Ñ?Ò?Ð° Ñ?Ð°Ñ?Ð°Ñ?Ñ? ÐºÓ©Ð¿Ñ?Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¾Ñ?Ñ?Ð½Ð° Ð¶Ò¯ÐºÑ?ÐµÐ»ÐµÐ´Ñ?.ÐÑ?Ñ?ÐµÑ?ÐµÑ?Ð°Ð»Ñ?Ò? Ñ?Ð·Ð´ÐµÑ?Ð´Ðµ Ð¶Ð°Ò£Ð°Ð´Ð°Ð½ Ò?Ò±Ñ?Ñ?Ð»Ò?Ð°Ð½ ÐºÓ©Ð¿Ñ?Ñ?Ð´Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ñ?Ð°Ð¼Ð¼Ð°Ð¼ÐµÐ½ Ð±Ñ?Ñ? ÐºÒ¯Ð½Ð³Ðµ Ð´ÐµÐ¹Ñ?Ð½ \"None\" Ð´ÐµÐ¹Ð´Ñ?.Ð?Ð·Ð´Ð°Ð¿ Ñ?Ñ?Ð´Ð°Ð¼Ð°Ð´Ñ? Ð±Ð¾Ð»Ñ?Ò£Ñ?Ð·, Ñ?Ð¾Ð´Ð°Ð½ ÐºÐµÐ¹Ñ?Ð½ Ð¾Ð» ÐºÓ©Ð¿Ñ?Ñ?Ð´Ñ?Ò£ Ð½Ð°Ò?Ñ?Ñ? Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ?Ð½Ðµ Ð°Ñ?Ñ?Ñ?Ð°Ð´Ñ?.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ? Ñ?Ò¯Ñ?Ñ?Ð½Ñ?Ò£ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¡Ñ?Ð·Ð³Ðµ IPv6 Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ð»Ð°Ñ?Ñ? ÐºÐµÑ?ÐµÐº Ð¿Ðµ?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s Ñ?Ñ?Ð·Ð³Ðµ Ò?Ð°Ð¶ÐµÑ?Ð¿Ðµ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ?Ò£Ñ?Ð· Ð´Ò±Ñ?Ñ?Ñ? Ð±ÐµÐ¹Ð½ÐµÐ½Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ð¿ÐµÐ¹Ð´Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð¾Ò?Ð°Ñ?Ñ?Ð´Ð°Ò?Ñ? Ñ?Ñ?Ñ?ÐµÑ?Ñ?ÐµÐ³Ñ? Ñ?Ð°Ò£Ð±Ð°Ð»Ð°Ñ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ?Ò£Ñ?Ð· ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·Ð´Ñ? Ò?Ð°Ð»Ð°Ð¹ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ò?Ð° Ð±Ð¾Ð»Ð°Ð´Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor Browser-Ð³Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ? Ò¯Ñ?Ñ?Ð½, Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ñ? Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ %sTor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·\n %sÐ¶Ó?Ð½Ðµ Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ Ð½Ò±Ñ?Ò?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ñ? Ð¾Ò?Ñ?Ð¿ Tor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ Ð?Ð?Ð¡Ð¢Ð?Ò¢Ð«Ð?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ð?Ñ?Ñ?Ñ?Ð½Ñ?Ñ?, Ñ?Ñ?Ð· %s Tor Browser-Ð´Ñ? Ð¶Ò¯ÐºÑ?ÐµÑ?Ñ?Ò£Ñ?Ð· Ò?Ð°Ð¶ÐµÑ?%s.Ð?Ñ?Ð·Ð´Ñ?Ò£ Tor Browser-Ð´Ñ? Ò?Ð¾Ð»Ð´Ð°Ð½Ñ?Ñ?Ñ?Ð»Ð°Ñ?Ò?Ð° Ð°Ñ?Ð½Ð°Ð»Ò?Ð°Ð½ Ð?Ò±Ñ?Ò?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ð¼Ñ?Ð·Ð´Ð° Tor Browser-Ð³Ðµ Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ñ?Ò£Ñ?Ð·Ð´Ñ?Ò£ Ò?Ð°Ð»Ð°Ð¹ Ò?Ð¾Ñ?Ñ? ÐºÐµÑ?ÐµÐº ÐµÐºÐµÐ½Ð´Ñ?Ð³Ñ? Ñ?Ò¯Ñ?Ñ?Ð½Ð´Ñ?Ñ?Ñ?Ð»Ð³ÐµÐ½.Ð?Ð³ÐµÑ? Ñ?Ñ?Ð· Windows, Linux, Ð½ÐµÐ¼ÐµÑ?Ðµ OS X Ò?Ð¾Ð»Ð´Ð°Ð½Ñ?Ð°Ò£Ñ?Ð· %sÐ¼Ñ?Ð½Ð°Ð½Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·%s.Ð?Ð³ÐµÑ? Ñ?Ñ?Ð· Android-Ñ?Ñ? Ò?Ð¾Ð»Ð´Ð°Ð½Ñ?Ð°Ò£Ñ?Ð· %sÐ¼Ñ?Ð½Ð° Ð¶ÐµÑ?Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor Network Settings' Ð´Ð¸Ð°Ð»Ð¾Ð³Ñ? Ñ?Ñ?Ò?Ò?Ð°Ð½ ÐºÐµÐ·Ð´Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?' Ð¿Ó?Ñ?Ð¼ÐµÐ½Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ð¿, Ð¾Ð½Ñ? Ð¾Ñ?Ñ?Ð½Ð´Ð°Ò£Ñ?Ð·\nÑ?ÐµÐ±ÐµÑ? Ñ?Ò±Ñ?Ð°Ò?Ð°Ð½Ñ?Ð°:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?ÐµÐ³Ñ? Ò?Ñ?Ð·Ð¼ÐµÑ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ñ?  Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ñ?Ò£Ñ?Ð·(ISP) Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ò?Ð° Ð±Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ?Ñ?Ñ? \"Tor\" Ð¶ÐµÐ»Ñ?Ñ?Ñ?Ð½ Ð±Ò±Ò?Ð°Ñ?Ñ?Ð°Ð¹Ð¼Ð°?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'Ð?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ñ?Ð°Ò£Ð´Ð°Ð¿, 'Ð?ÐµÐ»ÐµÑ?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·. Ð?Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð»Ð°Ñ?, ÐºÓ©Ñ?Ñ?Ñ?Ñ? Ð¶Ó?Ð½Ðµ\nÐºÓ©Ð¿Ñ?Ñ? Ð¶Ð¾Ð»Ð´Ð°Ñ?Ñ?Ð½ Ð¼Ó?Ñ?Ñ?Ð½ ÐµÐ½Ð³Ñ?Ð·Ñ? Ð¶Ð¾Ð»Ð°Ò?Ñ?Ð½Ð° Ò?Ð¾Ð¹Ñ?Ò£Ñ?Ð·. Ð¡Ð¾Ò£Ñ?Ð½Ð´Ð°, Â«Ò?Ð¾Ñ?Ñ?Ð»Ñ?Â» Ñ?Ò¯Ð¹Ð¼ÐµÑ?Ñ?Ð³Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·.\nÐ?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ðµ Ò?Ð¸Ñ?Ð½Ð´Ñ?Ò?Ñ?Ð°Ñ? Ñ?Ñ?Ñ?Ð½Ð´Ð°Ñ?Ð°, Â«Ð?Ð½Ñ?Ò?Ñ?Ð°Ð¼Ð°Â» Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ\nÒ?Ð¾Ñ?Ñ?Ð¼Ñ?Ð° ÐºÓ©Ð¼ÐµÐº Ð°Ð»Ñ? Ò¯Ñ?Ñ?Ð½ Â«Tor Network SettingsÂ» Ð±Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ò±Ð» Ñ?Ð°Ð±Ð°Ñ?Ð´Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?ÐµÐ´Ñ?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ð½Ð¸Ð»Ñ?Ð´Ñ? ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ñ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ò±Ñ?Ð°Ñ?."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ð»Ð³ÐµÐ½ Ñ?Ð°Ñ?Ñ?Ð¼Ð°Ð»Ð´Ñ? Ñ?Ò±Ñ?Ð°Ò£Ñ?Ð·."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB Ò?Ð¾Ò?Ð°Ð¼Ð´Ñ?Ò? GnuPG ÐºÑ?Ð»Ñ?Ñ?Ð½Ñ?Ò£ ÐºÓ©Ñ?Ñ?Ñ?Ð¼ÐµÑ?Ñ?Ð½ Ð°Ð»Ñ?Ò£Ñ?Ð·."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
index 261d478..9ae5b1f 100644
--- a/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
@@ -1,100 +1,209 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
+# Dany Sum <danysum696@xxxxxxxxx>, 2018
 # Seng Sutha <sutha@xxxxxxxxxxx>, 2014
 # Sokhem Khoem <sokhem@xxxxxxxxxxx>, 2014
 # Sok Sophea <sksophea@xxxxxxxxx>, 2014
 # Sok Sophea <sksophea@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2014-10-15 17:11+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>\n"
-"Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»á??â??á??á?¶á??á?½á??â??á??á??á??á?¾â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: lib/bridgedb/strings.py:18
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[á??á??á??â??á??á?¶â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??á??á??á??á?·; á??á?¼á??â??á??á?»á??â??á??á??á??á?¾á??á??á??á??]"
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á?¶á??á?¶"
 
-#: lib/bridgedb/strings.py:20
-msgid "Here are your bridges:"
-msgstr "á??á??á??â??á??á?¶â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
 
-#: lib/bridgedb/strings.py:22
-#, python-format
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "á??á?¼á??â??á??á??á??á??á??"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "á??á??á??á?¾á??á??á?¾á??á??á?¶á??á??á?¢á??á??"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "á??á??á??á? á?¶á?? QRá??á?¼á??"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
-"You have exceeded the rate limit. Please slow down! The minimum time between\n"
-"emails is %s hours. All further emails during this time period will be ignored."
-msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " á??á??á??á? á??á??â??á??á?¶â??á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¶á??á?¶á?? %s á??á??á??á?¡á??á??â??á??á??â??á??á?¶á??á?? %s á? á?¾á??â??á??á??á??á?¾á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??á??!"
 
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
-msgid "Welcome to BridgeDB!"
-msgstr "á??á??á??á?¶á??á??á??á??â??á??á??á??á?¶á??á?? BridgeDB!"
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "á??á??á? á?¶á?? %s1%s"
 
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
-msgid "Currently supported transport TYPEs:"
-msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á??â??á??á??á??á??á??â??á??á?¶á??â??á??á?¶á??á??á??á?? TYPEs á??"
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
-msgid "Hey, %s!"
-msgstr "á? á??, %s!"
+msgid "Step %s2%s"
+msgstr "á??á??á? á?¶á?? %s2%s"
 
-#: lib/bridgedb/strings.py:32
-msgid "Hello, friend!"
-msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
-msgid "Public Keys"
-msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "á??á??á? á?¶á?? %s3%s"
 
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "á??á??"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "á??á??á??á?¶á??"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "á??á??á??â??á??á?¶â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "á?¢á??á?¸á??á??á??â??á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á?¾á??â??á?¡á?¾á??â??â??á??á?¶á??á?½á?? rainbows, unicorns, á??á?·á?? sparkles\ná??á??á??á??á?¶á??á?? %s á??á?¾ %s á??á?? %s á??"
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,7 +214,7 @@ msgid ""
 msgstr "BridgeDB á??á?·á??â??á?¢á?¶á??â??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á?¶á??á?½á??â??á??á??á??á??á??á?? %stypes á??á?½á??â??á??á??á??á?½á??â??á??á?? Pluggable Transports%s,\ná??á??á??â??á?¢á?¶á??â??á??á?½á?? obfuscate á??á?¶á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??â??á?¢á??á??á??â??á??á??â??á??á?¶á??á??â??á??á??á??á??á?¶á?? Tor , á??á??á??á?¾â??á?²á??á??â??á??á?¶â??á??á?¶á??â??á??á?¶á??â??á??á?·á??á?¶á??â??á??á??á??á??á?¶á??á??â??â??á??á?¾á??â??á??á??á?¶á??á??á??á??â??á??á??á??á??â??á?¢á??á??á??â??á??á??á??á?»á??â??á??á?¶á??â??á??á??á??á??á??â??á??á?¶â??á?¢á??á??á??â??á??á??á??á?»á??â??á??á??á??á?¾ Tor á??\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -117,7 +226,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -126,235 +235,169 @@ 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"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "á??á?¾â??á??á??á??á??á?¸á??á??á??â??â??á??á?¶â??á?¢á??á??á?¸?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á?·á??á?¸á??á?¶á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á?¶â??á??á??â??á??á?¶á??â??á??á??á?½á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: lib/bridgedb/strings.py:83
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "á??á?·á??á?¸á??á?½á??â??á??á??á??â??á??á?¾á??á??á??á?¸á??á??á?½á?? bridges á??á?ºâ??á??á??á??á?¼á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á?? %s á?? á??á?¼á??â??á??á??á??á?¶á??â??á??á?¶ á?¢á??á??á??á??á??á??á?¼á??â??á??á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á??á??â??á??á??á??á?¾á?¢á?¶á??á??á??á??á??á?¶á??â??á??á?¸â??á??á??á??á?»á??á? á??á?»á??â??á??á??á??á??á??á?¢á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?»á??â??á??á??á??á??á??â??á??á??á??á?»á??á? á??á?»á??â??á??á?¶á??â??á??á??á??á??á??á??\n%s, %s á?¬ %s á??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "á??á??á??á??á?¸á??á??á??â??â??á??á??á??á??â??á??á??á??á?»á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??! á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á??á??á?½á??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á??á??á??á?·á??á??á?¾ Tor á??á??á??á??â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??, á?¢á??á??á??â??á??á?½á??á??á??â??á?¢á??á?¸á??á??á?? %s á??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "á??á??á??â??á??á?¶â??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "á??á??á?½á??â??á??á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: lib/bridgedb/strings.py:108
-msgid "Please select options for bridge type:"
-msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
-
-#: lib/bridgedb/strings.py:109
-msgid "Do you need IPv6 addresses?"
-msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
-
-#: lib/bridgedb/strings.py:110
-#, python-format
-msgid "Do you need a %s?"
-msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
-
-#: lib/bridgedb/strings.py:114
-msgid "Your browser is not displaying images properly."
-msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
-
-#: lib/bridgedb/strings.py:115
-msgid "Enter the characters from the image above..."
-msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
-
-#: lib/bridgedb/strings.py:119
-msgid "How to start using your bridges"
-msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "á??á?¾á??á??á??á?¸â??á??á??á??á??á?¼á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser, á?¢á??á?»á??á??á??á??â??á??á??á??á??á??á??á?¸â??á??á??á??á?¶á??â??á??á??â??á??á?¾â??á??á??á??á??á??â?? %s Tor\nBrowser  %s á??á?¾á??á??á??á?¸â??á??á?¶á??á??á??á??á??á?¾á?? Tor Browser á??"
+"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 ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:115
+#, python-format
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "á??á??â??á??á??á??â??á??á??á??á?¢á??á??â?? 'á??á?¶á??â??á??á??á??á??á??â??á??á??á??á??á?¶á??' á??á??á??â??á?¡á?¾á??, á??á?»á?? 'á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??' á??á?·á??â??á?¢á??á?»á??á??á??á??â??á?¢á??á??á??â??á??á??á??á?½á??á??á?¶á??â??á??á? á?¼á??â??á??á??á??â??á??á?¶á??á??á?·á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+"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 ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:119
+#, python-format
 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?"
+"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 ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:125
+#, python-format
 msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-
-#: lib/bridgedb/strings.py:141
-msgid "Displays this message."
-msgstr "á??á??á??á? á?¶á??â??á??á?¶á??â??á??á??á??á??"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
-msgid "Request vanilla bridges."
-msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á?¼á??á??á??á??á?¶á??á??"
-
-#: lib/bridgedb/strings.py:146
-msgid "Request IPv6 bridges."
-msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á?? IPv6 á??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??â??á?¢á?¶á??â??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á??á?? TYPE á??"
-
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Get a copy of BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "á??á?¼á??â??á??á??á??á??á??"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Changelog"
+"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 ""
 
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "á??á??á??á?¶á??á??á??á??á??á??"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
+#: bridgedb/strings.py:130
+#, 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 ""
 
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
+#: bridgedb/strings.py:138
 msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " á??á??á??á? á??á??â??á??á?¶â??á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¶á??á?¶á?? %s á??á??á??á?¡á??á??â??á??á??â??á??á?¶á??á?? %s á? á?¾á??â??á??á??á??á?¾á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??á??!"
+"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 ""
 
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "á??á??á? á?¶á?? %s1%s"
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
 
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
 
-#: lib/bridgedb/templates/index.html:25
+#: bridgedb/strings.py:150
 #, python-format
-msgid "Step %s2%s"
-msgstr "á??á??á? á?¶á?? %s2%s"
+msgid "Do you need a %s?"
+msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
 
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
 
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "á??á??á? á?¶á?? %s3%s"
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
 
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser %s"
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
 
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
 #, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "á??á??"
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "á??á??á??á?¶á??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
index 14595d1..36d6aff 100644
--- a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
@@ -1,22 +1,21 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # ilbe123 <a3057016@xxxxxxxxx>, 2014
 # Chris Park <utopinator@xxxxxxxxx>, 2016
 # snotree <cknblue@xxxxxxxxx>, 2017
 # cwt96 <cwt967@xxxxxxxxx>, 2012
 # ê³ ì??ì?± <greenknite@xxxxxxxxx>, 2015
 # Hyuntae Chun, 2017
-# Oliver Lee, 2018
+# ebde8080c092fc908416083a701feb30, 2018
 # Jamin <bakzaa@xxxxxxxxx>, 2014
 # Dr.what <javrick6@xxxxxxxxx>, 2014-2015
 # Gu Hong Min <placidmoon1@xxxxxxxxx>, 2015
 # ë¥?ì¢?í??, 2015
 # Myeongjin <aranet100@xxxxxxxxx>, 2016
-# Oliver Lee, 2019
+# ebde8080c092fc908416083a701feb30, 2019
 # ì?´í?¼ì??ì??ë¦¬ <pcsori@xxxxxxxxx>, 2012
 # Philipp Sauter <qt123@xxxxx>, 2018
 # Sam Ryoo <samryoo@xxxxxxxxx>, 2014
@@ -27,116 +26,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-10 10:10+0000\n"
-"Last-Translator: woo lee <leewoo0614@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? ë¬´ì?¸ê°? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ì?¸ì?´"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "ë²?ê·¸ë¥¼ ë³´ê³ í??ê¸°"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ì??ì?¤ ì½?ë??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "ë³?ê²½ ê¸°ë¡?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ì?°ë?½í??ê¸°"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ëª¨ë?? ì? í??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRì½?ë?? ë³´ê¸°"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ë¸?ë¦¿ì§? ë?¼ì?¸ì?? ì??í?? QRì½?ë??"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "ì?´ë¨¸ë??, ë?ê°? ì??ëª»ë??ì??ì?µë??ë?¤!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR ì½?ë??ë¥¼ ë¶?ë?¬ ì?¤ë?? ì¤? ì?¤ë¥?ê°? ì??ê¸´ ê²? ê°?ì?µë??ë?¤."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "ì?´ QRì½?ë??ë?? ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ì?? í?¬í?¨í??ê³  ì??ì?µë??ë?¤. ë¸?ë¦¿ì§? í??ì?? ë?¤ë¥¸ ê¸°ê¸°ë¡? ë³µì?¬í??ë ¤ë©´ QRì½?ë?? ë¦¬ë??ë¡? ì?¤ìº?í??ì?¸ì??."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "í??ì?¬ ì?¬ì?©í?  ì?? ì??ë?? ë¸?ë¦¿ì§?ê°? ì??ì?µë??ë?¤..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "%s ë??ë??ì??ê°?ì?? %s ë?¤ë¥¸ ë¸?ë¦¿ì§? í??ì??ë?? ê³¨ë?¼ë³´ì?¸ì??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor ë¸?ë?¼ì?°ì ? %së¥¼ ë?¤ì?´ë°?ì?µë??ë?¤ "
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ë¸?ë¦¿ì§? %së¥¼ ê°?ì ¸ì?µë??ë?¤"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
@@ -145,27 +159,27 @@ msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sê·¸%së?¥ ë¸?ë¦¿ì§? ì£¼ì?¸ì??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "ê³ ê¸? ì?µì??"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ì??ì??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%së?¤!%s"
@@ -173,69 +187,37 @@ msgstr "%së?¤!%s"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%së¸?%së¦¿ì§? ì?»ê¸°"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ì?´ê²?ì?? ì??ë??ì?¼ë¡? ì??ì?±ë?? ë©?ì??ì§?ì??ë??ë?¤; í??ì? í??ì§? ë§?ì?ì??ì?¤.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§?ë?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "ì??ë?? ì ?í??ì?? ì´?ê³¼í??ì??ì?µë??ë?¤. ì??ë??ë¥¼ ë?®ì¶?ì?¸ì??! ì?´ë©?ì?¼ ê°?ì?? ìµ?ì?? ê°?ê²©ì??\n%s ì??ê°?ì??ë??ë?¤. ì?´ ê¸°ê°? ë??ì??ì?? ì¶?ê°?ì ?ì?¸ ëª¨ë?  ì?´ë©?ì?¼ì?? ë¬´ì??ë?  ê²?ì??ë??ë?¤."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (COMMANDsë¥¼ ì??ì?´ì?? ì?¬ë?¬ ì?µì??ì?? ë??ì??ì?? êµ¬ì²´í?? í??ì?¸ì??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ì§?ì??ì?´ ë??ë?? transport TYPEs"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ì ?ê¸°, %sì?¼! "
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ì??ë?? ì¹?êµ¬!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "ê³µê°? í?¤"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "ì?´ ì?´ë©?ì?¼ì?? %sì??ê²? %sì?? %sì??ì??\në¬´ì§?ê°?, ì? ë??ì½? ê·¸ë¦¬ê³  ë°?ì§?ì?´ë¡? ì??ì?±ë??ì??ì?µë??ë?¤."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -246,7 +228,7 @@ msgid ""
 msgstr "BridgeDB ë?? ì?¬ë?¬ ì¢?ë¥?ì?? %sì?½ì??í?? ì?¥ì¹?%s ì??ì?? ë¸?ë¦¿ì§?ë¥¼ ì ?ê³µí?©ë??ë?¤.\nì?´ê²?ì?? Tor ë?¤í?¸ì??í?¬ì??ì?? ì?°ê²°ì?? ë??ë??í?? ì??í?¤ë©° ë??êµ°ê°? ì?¸í?°ë?· í?¸ë??í?½ì??\nê°?ì??í??ë?? ì?¬ë??ì?´ ë?¹ì? ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ì?¬ì?©í??ê³  ì??ë?¤ë?? ê²?ì?? ì??ë³?í??ê¸° ì?´ë µê²? í?©ë??ë?¤.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -258,7 +240,7 @@ msgstr "ëª?ëª? ë¸?ë¦¬ì§?ë?? IPv6 ì£¼ì??ë?? ì§?ì??í??ë??,\nPluggable Transports
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -267,134 +249,169 @@ msgid ""
 "\n"
 msgstr "ê±°ê¸°ë?¤, BridgeDBë?? %s Pluggable Transportê°? ì??ë?? %s\ní??í?´ë¹ ì§? ë¸?ë¦¿ì§?ë?¤ë?? ë§?ì??ì??. ë??ë?¨í?? ì??ë¦¬ê°?ì§? ì??ê² ì§?ë§?,\nê·¸ë??ë?? ì?¬ë?¬ ëª¨ë¡? ì?¸í?°ë?· ê²?ì?´ ì?°í??ë¥¼ ë??ì??ì¤?ë??ë?¤.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "'ë¸?ë¦¿ì§?'ë???"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %së?? ë?¹ì? ì?´ ê²?ì?´ì?? í?¼í? ì?? ì??ê²? í??ë?? Tor ë¦´ë ?ì?´ì??ë??ë?¤. "
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?? ì?? ì??ë?? ë?¤ë¥¸ ë°©ë²?ì?? %s ë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì??ë?? ê²?ì??ë??ë?¤.\nì?´ ì?´ë©?ì?¼ ì??ë¹?ì?¤ë¥¼ í?µí?´ì?? ë³´ë?´ì??ì?¼ í??ë?¤ë?? ê²?ì?? ëª?ì?¬í?´ ì£¼ì?¸ì?? :\n%s, %s, %s"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "ë¸?ë¦¿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ë§?ì?½ Torê°? ì??ë??í??ì§? ì??ì?¼ë©´, %së¡? ì?´ë©?ì?¼ì?? ë³´ë?´ ì£¼ì?¸ì??. "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ê°?ë?¥í?? í?? ë§?ì?? ì ?ë³´ë¥¼ í?¬í?¨í?´ì£¼ì?¸ì??.\nì??ë¥¼ ë?¤ì?´ ë¸?ë¦¿ì§? ëª©ë¡? ë°? ì?¬ì?©í??ë ¤ë?? Pluggable Transport,\nTor ë¸?ë?¼ì?°ì ? ë²?ì ?, Torê°? ì¤? ë©?ì??ì§? ë?±."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ë?¤ì?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?¼ì?¸ì??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "ì??ì??"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "ë¸?ë¦¿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? ê³¨ë?¼ ì£¼ì?¸ì??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ì£¼ì??ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? ëª»í?©ë??ë?¤."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "ì?? ê·¸ë¦¼ì?? ë¬¸ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?¬ì?©í??ë?? ë°©ë²?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?ë¦¬ì§?ë¥¼ ì??ë ¥í??ë ¤ë©´ ë¨¼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?ì¹¨ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë??í??ì°½ì?´ ë?¨ë©´, 'ì?¤ì ?'ì?? í?´ë¦í??ê³  ì??ë?? ì§?ë¬¸ì?´ ë??ì?¬ë??ê¹?ì§?\në§?ë²?ì?¬ë¥¼ ë?°ë?¼ì£¼ì?¸ì??:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "ë?¹ì? ì?? ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨ ë??ë?? ê²?ì?´í??ë??ì???"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??ë¥´ì?  í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ ì£¼ì?¸ì??.\në¸?ë¦¿ì§?ë¥¼ ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì?  ë¸?ë¦¿ì§?ë¥¼ í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì?  ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'ë¥¼ ë??ë?¬ ì£¼ì??ë©´ ì??ë??ë?  ê²?ì??ë??ë?¤!\në§?ì?½ ë¬¸ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "ì?´ ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "ì?¼ë°? ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "ì?½ì??í?? ì?¥ì¹?ë¥¼ TYPEë¥¼ í?µí?´ì?? ì??ì²í??ì?¸ì??."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDBì?? ê³µê°? GnuPG í?¤ë¥¼ ì?»ì?µë??ë?¤."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..6a5e6b8
--- /dev/null
+++ b/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,406 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
+# Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
+# Moo, 2015-2020
+# Saule Papeckyte <saule.papeckyte@xxxxxxxxx>, 2015
+# Edgaras7 <system@xxxxxxxxxxxxxxx>, 2014
+# Tautvydas Zukauskas <lordmu@xxxxxxxxxxxxx>, 2016
+# Tomas Darius Davainis <tomasdd@xxxxxxxxx>, 2018
+# TylQuest, 2014
+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-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Atleiskite! KaÅ¾kas nutiko su jÅ«sÅ³ uÅ¾klausa."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kalba"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "PraneÅ¡ti apie klaidÄ?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Pirminis kodas"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "KeitiniÅ³ Å¾urnalas"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Å½ymÄ?ti viskÄ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Rodyti QR kodÄ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "JÅ«sÅ³ tinklÅ³ tilto linijÅ³ QR kodas"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Atrodo, kad gaunant jÅ«sÅ³ QR kodÄ?, Ä¯vyko klaida."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Å iame QR kode yra jÅ«sÅ³ tinklÅ³ tilto linijos. Nuskenuokite Å¡Ä¯ kodÄ?, naudodami QR kodÅ³ skaitytuvÄ?, kad nukopijuotumÄ?te savo tinklÅ³ tilto linijas Ä¯ mobilÅ³jÄ¯ ar kitus Ä¯renginius."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Å iuo metu nÄ?ra prieinami jokie tinklÅ³ tiltai..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "GalbÅ«t, jums reikÄ?tÅ³ pabandyti %s grÄ¯Å¾ti atgal %s ir pasirinkti kitÄ? tinklÅ³ tilto tipÄ?!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s Å¾ingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "AtsisiÅ³skite %s Tor NarÅ¡yklÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s Å¾ingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Gaukite %s tinklÅ³ tiltus %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s Å¾ingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Dabar, %s pridÄ?kite tinklÅ³ tiltus Ä¯ Tor NarÅ¡yklÄ? %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%siesiog suteikite man tinklÅ³ tiltus!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "IÅ¡plÄ?stiniai parametrai"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "nÄ?ra"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%saip!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%sauti tinklÅ³ tiltus"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Å tai jÅ«sÅ³ tinklÅ³ tiltai:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "JÅ«s virÅ¡ijote savo perdavimo limitÄ?. PraÅ¡ome nurimti! Minimalus laikas tarp\nel. laiÅ¡kÅ³ yra %s valandos. TolimesniÅ³ laiÅ¡kÅ³, Å¡iuo laikotarpiu bus nepaisoma."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB gali suteikti tinklÅ³ tiltus, su keletu %stipÅ³ keiÄ?iamÅ³jÅ³ perdavimÅ³%s,\nkurie gali padÄ?ti paslÄ?pti jÅ«sÅ³ prisijungimus prie Tor tinklo ir taip apsunkinti\nkitiems asmenims, siekiantiems iÅ¡siaiÅ¡kinti ar naudojatÄ?s Tor, jÅ«sÅ³ interneto srauto stebÄ?jimÄ?.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Yra prieinami kai kurie tinklÅ³ tiltai su IPv6 adresais, taÄ?iau kai kurie keiÄ?iamieji perdavimai\nnÄ?ra suderinami su IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "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:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Kas yra tinklÅ³ tiltai?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s TinklÅ³ tiltai %s yra Tor retransliavimai, kurie padeda apeiti cenzÅ«rÄ?."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Man reikia alternatyvaus bÅ«do tinklÅ³ tiltams gauti!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Kitas bÅ«das gauti tinklÅ³ tiltÅ³ yra siÅ³sti el. laiÅ¡kÄ? Ä¯ %s. Palikite el. laiÅ¡ko temÄ? tuÅ¡Ä?iÄ?,\no pagrindinÄ?je el. laiÅ¡ko dalyje paraÅ¡ykite \"get transport obfs4\". TurÄ?kite omenyje,\nkad el. laiÅ¡kÄ? privalote iÅ¡siÅ³sti naudodami vieno iÅ¡ Å¡iÅ³ el. paÅ¡to tiekÄ?jÅ³ adresÅ³: %s arba %s."
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Mano tinklÅ³ tiltai neveikia! Man reikia pagalbos!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Jeigu jÅ«sÅ³ Tor NarÅ¡yklÄ? negali prisijungti, paÅ¾iÅ«rÄ?kite Ä¯ %s ir mÅ«sÅ³ %s."
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Å tai jÅ«sÅ³ tinklÅ³ tilto linijos:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Gauti tinklÅ³ tiltus!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "NÄ?ra"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "PraÅ¡ome paÅ¾ymÄ?ti tinklÅ³ tilto tipo parametrus:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "Ar jums reikia IPv6 adresÅ³?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Ar jums reikia %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "JÅ«sÅ³ narÅ¡yklÄ? netinkamai atvaizduoja paveikslus."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Ä®veskite simbolius iÅ¡ aukÅ¡Ä?iau esanÄ?io paveikslo..."
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Kaip pradÄ?ti naudotis tinklÅ³ tiltais"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
index a1ccaa5..bcb5136 100644
--- a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012
@@ -10,116 +10,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Valoda"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "ZiÅ?ot par kÄ¼Å«du"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Pirmkods"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "IzmaiÅ?u Å¾urnÄ?ls"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "SazinÄ?ties"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "AtlasÄ«t visu"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "ParÄ?dÄ«t QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode JÅ«su tiltu rindÄ?m"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ak, man' dieniÅ?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "SÄ·iet, ka, saÅ?emot JÅ«su QRCode, notika kÄ¼Å«da."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ?jiet to ar QRCode lasÄ«tÄ?ju, lai iekopÄ?tu JÅ«su tiltu rindas mobilajÄ? tÄ?lrunÄ« un citÄ?s iekÄ?rtÄ?s."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Å obrÄ«d nav pieejamu tiltu..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "IespÄ?jams, ka Jums jÄ?mÄ?Ä£ina %s atgriezties %s un izvÄ?lÄ?ties citu tiltu veidu!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Solis %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "LejuplÄ?dÄ?t %s PÄ?rlÅ«ku Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Solis %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "SaÅ?emt %s tiltus %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Solis %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
@@ -128,27 +143,27 @@ msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%sikai dodiet man tiltus!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "LietpratÄ?ju opcijas "
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÄ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nekas"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÄ?!"
@@ -156,69 +171,37 @@ msgstr "%sJ%sÄ?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%saÅ?emt tiltus"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Å is ir automÄ?tisks ziÅ?ojums; lÅ«dzu neatbildiet.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Te ir JÅ«su tilti:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "JÅ«s esat pÄ?rsniedzis pÄ?rraides normu. LÅ«dzu, lÄ?nÄ?k. MinimÄ?lais laika ilgums starp\ne-pastiem ir %s stundas. Å ajÄ? laika posmÄ? visi turpmÄ?kie e-pasti tiks ignorÄ?ti."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (apvienot KOMANDA's, lai vienlaicÄ«gi norÄ?dÄ«tu daÅ¾Ä?das opcijas)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "SveicinÄ?ti BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Å obrÄ«d atbalstÄ«tie transporta VEIDI:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Sveiks, draug!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "PubliskÄ?s atslÄ?gas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "This email was generated with rainbows, unicorns, and sparkles\npriekÅ¡ %s dienÄ? %s pl %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
 msgstr "BridgeDB var nodroÅ¡inÄ?t tiltus ar daÅ¾Ä?diem %stypes Pluggable Transports%s,\nkas var palÄ«dzÄ?t maskÄ?t JÅ«su savienojumu ar Tor Network, tÄ?dÄ?jÄ?di padarot sareÅ¾Ä£Ä«tÄ?k ikvienam, kas seko JÅ«su interneta datu plÅ«smai, noteikt, ka lietojat Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,7 @@ msgstr "Ir pieejami daÅ¾i tilti ar IPv6 adresÄ?m; tanÄ« pat laikÄ? daÅ¾i Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
 "\n"
 msgstr "TurklÄ?t BridgeDB ir pietiekami daudz parastu, vienkÄ?rÅ¡u tiltu %s bez jebkÄ?diem\nPluggable Transports %s, kas iespÄ?jams neizklausÄ?s tik inÄ?Ä«gi, bet arÄ« tie var\ndaudzos gadÄ«jumos palÄ«dzÄ?t apiet interneta cenzÅ«ru.\n \n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Kas ir tilti?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Tilti %s ir Tor retranslatori, kas palÄ«dz Jums apiet cenzÅ«ru."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Man nepiecieÅ¡ams alternatÄ«vs tiltu iegÅ«Å¡anas veids!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "VÄ?lviens veids kÄ? saÅ?emt tiltus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ?rojiet, ka e-pasts ir\njÄ?nosÅ«ta no viena no sekojoÅ¡ajiem e-pasta pakalpojumu sniedzÄ?jiem:\n%s, %s vai %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mani tilti nestrÄ?dÄ?! Man nepiecieÅ¡ama palÄ«dzÄ«ba!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ja JÅ«su Tor nestrÄ?dÄ?, Jums jÄ?nosÅ«ta e-pasts %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Centieties iekÄ¼aut pÄ?c iespÄ?jas daudz informÄ?ciju par savu situÄ?ciju, tostarp pievienojot to tiltu un Pluggable Transports sarakstu, kurus centÄ?ties izmantot, savu Tor Browser versiju un visus Tor ziÅ?ojumus, un citu lÄ«dzÄ«gu informÄ?ciju."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Te ir JÅ«su tiltu lÄ«nijas:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "SaÅ?emt Tiltus!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Nav"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Vai ir nepiecieÅ¡amas IPv6 adreses?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Vai ir nepiecieÅ¡ams %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "KÄ? sÄ?kt izmantot JÅ«su tiltus"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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Ä?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Vai JÅ«su Interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai citÄ?dÄ? veidÄ? cenzÄ? savienojumus\nar tÄ«klu Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Atlasiet \"JÄ?\" un tad noklikÅ¡Ä·iniet \"TÄ?lÄ?k\". Lai konfigurÄ?tu savus jaunos tiltus, kopÄ?jiet un\nielÄ«mÄ?jiet tiltu lÄ«nijas teksta ievades lodziÅ?Ä?. BeigÄ?s nokliÅ¡Ä·iniet \"Izveidot savienojumu\" un\nvisam vajadzÄ?tu notikt! Ja ir problÄ?mas, turpmÄ?kai palÄ«dzÄ«bai pamÄ?Ä£iniet nokliÅ¡Ä·inÄ?t vednÄ« \"Tor tÄ«kla iestatÄ«jumi\" pogu \"PalÄ«dzÄ«ba\"."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "RÄ?da ziÅ?ojumu."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PieprasÄ«t parastos tiltus."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PieprasÄ«t IPv6 tiltus."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PieprasÄ«t Pluggable Transport pÄ?c TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "SaÅ?emt BridgeDB publiskÄ?s GnuPG atslÄ?gas kopiju."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
index 3b33515..7813e69 100644
--- a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Cacko Cackoas <cackothe@xxxxxxxxx>, 2015
+# Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 2019
 # Viktor Hristov, 2014
-# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018
+# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-11-06 01:52+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-19 11:54+0000\n"
 "Last-Translator: Zarko Gjurov <zarkogjurov@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"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½ÐµÑ?Ðµ! Ð¡Ðµ Ñ?Ð»Ñ?Ñ?Ð¸ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð¾ Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð±Ð°Ñ?Ð°Ñ?Ðµ."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð°Ð·Ð¸Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?ÐµÐ½ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð?Ð¾Ð³ Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð´Ð±ÐµÑ?Ð¸ Ñ?Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?ÐµÐ»Ðµ Ð¼Ð°Ñ?ÐºÐ¾!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð¼Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð´Ð¾Ð±Ð¸Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? QR ÐºÐ¾Ð´."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ð²Ð¾Ñ? QR ÐºÐ¾Ð´ Ð³Ð¸ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ? Ð³Ð¾ Ñ?Ð¾ QR ÐºÐ¾Ð´ Ñ?Ð¸Ñ?Ð°Ñ? Ñ?.Ðµ. Ñ?Ð¾ ÐºÐ°Ð¼ÐµÑ?Ð°Ñ?Ð° Ð·Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð¼Ð¾Ð±Ð¸Ð»ÐµÐ½ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ Ð¸Ð»Ð¸ Ð´Ñ?Ñ?Ð³ Ñ?Ñ?ÐµÐ´."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB Ð½Ð°Ð¸Ð´Ðµ Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶ÐµÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ðµ %s Ð²Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð°Ð·Ð°Ð´ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³ Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
@@ -128,27 +144,27 @@ msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð´Ð°Ñ? Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
@@ -156,69 +172,37 @@ msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ð²Ð° Ðµ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ð°ÐºÐ°; Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð½Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ñ?Ðµ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ð?Ð²Ð° Ðµ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½Ð°Ð²Ñ?Ðµ Ñ?Ñ?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð½Ð° Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ð°. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ð´ Ð·Ð°Ð¿Ñ?ÐµÑ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ñ?Ð¼ Ð²Ñ?ÐµÐ¼ÐµÑ?Ð¾ Ð¿Ð¾Ð¼ÐµÑ?Ñ?\nÐµ-Ð¿Ð¾Ñ?Ð°ÐºÐ¸Ñ?Ðµ Ðµ %s Ñ?Ð°Ñ?Ð¾Ð²Ð¸. Ð¡Ð¸Ñ?Ðµ Ð¿Ð¾Ð½Ð°Ñ?Ð°Ð¼Ð¾Ñ?Ð½Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð°ÐºÐ¸ Ð²Ð¾ Ð¾Ð²Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸ Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ñ?Ðµ Ð±Ð¸Ð´Ð°Ñ? Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð´Ð° Ð¿Ð¾Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð¸Ñ?Ñ?Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?Ð¾Ð±Ñ?ÐµÐ´Ð¾Ñ?Ð´Ð¾Ð²Ñ?Ðµ Ð²Ð¾ BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð¢Ð?Ð?Ð?Ð?Ð? Ð½Ð° Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ»Ñ?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¸"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?Ð²Ð°Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð±ÐµÑ?Ðµ Ñ?Ð¾Ð·Ð´Ð°Ð´ÐµÐ½Ð° Ñ?Ð¾ Ð´Ð¾Ð¶Ð´Ð¾Ñ?, Ð²Ð¸Ð½Ð¾Ð¶Ð¸Ñ?Ð°, ÐµÐ´Ð½Ð¾Ñ?Ð¾Ð·Ð¸, Ð¸ Ð¸Ñ?ÐºÑ?Ð¸ Ð·Ð° %s Ð½Ð° %s Ð²Ð¾ %s ."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ð?ÐºÐ¾ Ð¾Ð²Ð¸Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð½Ðµ Ñ?Ðµ Ñ?Ð¾Ð° Ñ?Ñ?Ð¾ Ð²Ð¸ Ñ?Ñ?ÐµÐ±Ð°, Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?ÐµÑ?Ðµ Ð½Ð° Ð¾Ð²Ð°Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ð¾ ÐµÐ´Ð½Ð° Ð¾Ð´\nÑ?Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð²Ð¾ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð° Ð½Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
 msgstr "BridgeDB Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ñ?Ð²Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð·Ð° Ð¿Ð¾Ð²ÐµÑ?Ðµ %s Ñ?Ð¸Ð¿Ð¾Ð²Ð¸ Ð½Ð° Pluggable Transports %s ,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð¿Ñ?Ð¸ Ð¼Ð°Ñ?ÐºÐ¸Ñ?Ð°Ñ?Ðµ Ð½Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð½ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°,\nÐ¿Ñ?Ð°Ð²ÐµÑ?Ñ?Ð¸ Ñ?Ð°\nÐ¿Ð¾Ñ?ÐµÑ?ÐºÐ° Ð·Ð° Ñ?ÐµÐºÐ¾Ñ? ÐºÐ¾Ñ? Ð³Ð¾ Ð½Ð°Ð´Ð³Ð»ÐµÐ´Ñ?Ð²Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð´Ð° Ñ?Ñ?Ð²Ñ?Ð´Ð¸ Ð´ÐµÐºÐ° Ð²Ð¸Ðµ\nÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,7 @@ msgstr "Ð?ÐµÐºÐ¾Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ñ?Ð¾ IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸ Ñ?Ðµ Ð¸Ñ?Ñ?Ð¾ Ñ?Ð°ÐºÐ°
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %sÐ±ÐµÐ· Ð½Ð¸Ñ?Ñ? ÐµÐ´ÐµÐ½\nPluggable Transports %s Ð¿Ñ?ÐµÐºÑ? ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶ÐµÐ±Ð¸ Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ ÐºÑ?Ð», Ð½Ð¾ Ñ?Ð¸Ðµ Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð¼Ð¾Ð¶Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð²Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s Ñ?Ðµ Tor Ñ?Ð°Ð·Ð»Ð¸ / Ñ?Ð²Ð¾Ñ?Ð¾Ð²Ð¸ ÐºÐ¾Ð¸ Ð²Ð¸ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð°Ñ? Ð²Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð°."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ð¼ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ðµ Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s. \nÐ?Ð°Ð±ÐµÐ»ÐµÑ?ÐºÐ°: Ð?Ð¾Ñ?Ð°Ñ?Ðµ\nÐ´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð½Ð° ÐµÐ´ÐµÐ½ Ð¾Ð´ Ñ?Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° / Ðµ-Ð¼Ð°Ð¸Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð¸:\n%s, %s Ð¸Ð»Ð¸ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ðµ Ð´Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s. Ð?Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ Ð³Ð¾ Ð¿Ð¾Ð»ÐµÑ?Ð¾ Ð½Ð°Ñ?Ð»Ð¾Ð² Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°\nÐ¿Ñ?Ð°Ð·Ð½Ð¾ Ð¸ Ð½Ð°Ð¿Ð¸Ñ?ÐµÑ?Ðµ \"Ð´Ð¾Ð±Ð¸Ñ? obfs4 Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?\" Ð²Ð¾ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°Ñ?Ð° Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°. Ð?Ð°Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ\nÐ´ÐµÐºÐ° Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¾Ð´ ÐµÐ´ÐµÐ½ Ð¾Ð´ Ñ?Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°\nÐ¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð¸: %s Ð¸Ð»Ð¸ %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ñ?Ð¾Ð³Ð°Ñ? Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?ÐºÐ»Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð¾ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸ Ñ?Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð»Ð¸Ñ?Ñ?Ð° Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð¸ Pluggable Transports ÐºÐ¾Ð¸ Ð¿Ñ?Ð¾Ð±Ð°Ð²Ñ?Ðµ Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð½Ð° Tor Browser,\nÐ¸ Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð°ÐºÐ¸ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð°Ð²Ð° Tor Ð²Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ñ?, Ð¸Ñ?Ð½."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?ÐºÐ¾ Ð²Ð°Ñ?Ð¸Ð¾Ñ? Tor Browser Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð·Ðµ, Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ?Ðµ Ð½Ð° %s Ð¸ Ð½Ð° %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐ½Ñ?Ð¸Ð¸:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?Ð¾Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¸Ð¼Ð¸ Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð°"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 Ð¸Ð¼Ð¿Ð»ÐµÐ¼ÐµÐ½Ñ?Ð¸Ñ?Ð° 4 Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸ Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸: \"HTTPS\", \"Moat\",\n\"Ð?-Ð¿Ð¾Ñ?Ñ?Ð°\", Ð¸ \"Ð ÐµÐ·ÐµÑ?Ð²Ð¸Ñ?Ð°Ð½Ð¾\". Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ ÐºÐ¾Ð¸ Ð½Ðµ Ñ?Ðµ Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¿Ñ?ÐµÐºÑ? BridgeDB Ð³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ñ?\nÐ¿Ñ?ÐµÐ²Ð´Ð¾-Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? \"Ð?Ð¸Ñ?Ñ?Ð¾\". Ð¡Ð»ÐµÐ´Ð½Ð°Ð²Ð° Ð»Ð¸Ñ?Ñ?Ð° ÐºÑ?Ð°Ñ?ÐºÐ¾ Ð¾Ð±Ñ?Ð°Ñ?Ð½Ñ?Ð²Ð° ÐºÐ°ÐºÐ¾ Ð¾Ð²Ð¸Ðµ\nÐ¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸ Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ? Ð¸ Ð½Ð°Ñ?Ð¸Ñ?Ðµ %sBridgeDB Ð¼ÐµÑ?ÐµÑ?Ð°%s Ð²Ð¸Ð·Ñ?ÐµÐ»Ð¸Ð·Ð¸Ñ?Ð°Ð°Ñ? ÐºÐ¾Ð»ÐºÑ? Ðµ Ð¿Ð¾Ð¿Ñ?Ð»Ð°Ñ?ÐµÐ½ Ñ?ÐµÐºÐ¾Ñ?\nÐ¾Ð´ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸Ñ?Ðµ."
+
+#: bridgedb/strings.py:115
+#, 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 "\"HTTPS\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ð³Ð¸ Ð¿Ñ?ÐµÐ´Ð°Ð²Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐºÑ? Ð¾Ð²Ð°Ð° Ð²ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð°.\nÐ?Ð° Ð´Ð° Ð·ÐµÐ¼ÐµÑ?Ðµ\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, Ð¾Ð´ÐµÑ?Ðµ Ð½Ð° %sbridges.torproject.org%s, Ð¾Ð´Ð±ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÐ¾Ð¸ Ð³Ð¸ Ð¿Ñ?ÐµÑ?ÐµÑ?Ð¸Ñ?Ð°Ñ?Ðµ, Ð¸\nÑ?ÐµÑ?ÐµÑ?Ðµ Ñ?Ð° CAPTCHA-Ñ?Ð° / Ð·Ð°Ð´Ð°Ñ?Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð° Ñ?Ð»ÐµÐ´Ñ?Ð²Ð°."
+
+#: bridgedb/strings.py:119
+#, 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 "\"Moat\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ðµ Ð´ÐµÐ» Ð¾Ð´ Tor Browser, ÐºÐ¾Ñ? Ð¸Ð¼ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ñ?Ð²Ð° Ð½Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ?Ðµ Ð´Ð°\nÐ¿Ð¾Ð±Ð°Ñ?Ð°Ð°Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð½Ð°Ñ?Ñ?Ðµ Ð¾Ð´ Ð½Ð¸Ð²Ð½Ð¸Ñ?Ðµ Tor Browser Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸. Ð?Ð° Ð´Ð° Ð·ÐµÐ¼ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, Ð¾Ð´ÐµÑ?Ðµ Ð½Ð°\nÐ²Ð°Ñ?Ð¸Ñ?Ðµ %sTor Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸%s Ð½Ð° Tor Browser, ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° \"Ð¿Ð¾Ð±Ð°Ñ?Ð°Ñ? Ð½Ð¾Ð² Ð¼Ð¾Ñ?Ñ?\", Ñ?ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°\nCAPTCHA-Ñ?Ð° / Ð·Ð°Ð´Ð°Ñ?Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð° Ñ?Ð»ÐµÐ´Ñ?Ð²Ð°, Ð¸ Tor Browse Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?Ðµ Ð³Ð¸ Ð´Ð¾Ð´Ð°Ð´Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
+
+#: bridgedb/strings.py:125
+#, 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 "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ð¶Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð±Ð°Ñ?Ð°Ð°Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð¿Ñ?ÐµÐºÑ? \"E-Ð¿Ð¾Ñ?Ñ?Ð°\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð¾ Ð¸Ñ?Ð¿Ñ?Ð°Ñ?Ð°Ñ?Ðµ Ð½Ð°\nÐµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %sbridges@xxxxxxxxxxxxxx%s Ð¸ Ð¿Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ðµ \"get transport obfs4\" Ð²Ð¾\nÑ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°Ñ?Ð°."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð¸Ñ?Ð°Ð½Ð¾"
+
+#: bridgedb/strings.py:130
+#, 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 Ð¾Ð´Ñ?Ð¶Ñ?Ð²Ð° Ð¼Ð°Ð» Ð±Ñ?Ð¾Ñ? Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ ÐºÐ¾Ð¸ Ð½Ðµ Ñ?Ðµ Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ð¸Ñ?Ð°Ð°Ñ?\nÐ°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸. Ð?Ð°Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð°, Ð½Ð¸Ðµ Ð³Ð¸ Ñ?ÐµÐ·ÐµÑ?Ð²Ð¸Ñ?Ð°Ð¼Ðµ Ð¾Ð²Ð¸Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð·Ð° Ñ?Ð°Ñ?Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ð¸Ñ?Ð¸Ñ?Ð° Ð¸\nÐ¸Ð¼ Ð³Ð¸ Ð¿Ñ?ÐµÐ´Ð°Ð²Ð°Ð¼Ðµ Ð½Ð° Ð?Ð?Ð? Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ð¸Ñ?Ðµ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð¸ Ð¸Ð½Ð´Ð¸Ð²Ð¸Ð´Ñ?Ð°Ð»Ñ?Ð¸ Ð½Ð° ÐºÐ¾Ð¸ Ð¸Ð¼ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¸\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸. Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ ÐºÐ¾Ð¸ Ñ?Ñ?Ð¾ Ñ?Ðµ Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¿Ñ?ÐµÐºÑ? \"Ð ÐµÐ·ÐµÑ?Ð²Ð¸Ñ?Ð°Ð½Ð¾\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? Ð¼Ð¾Ð¶Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ð½Ðµ Ð³Ð¸ Ð²Ð¸Ð´Ð°Ñ?\nÐ¿Ð¾Ð´Ð¾Ð»Ð³Ð¾ Ð²Ñ?ÐµÐ¼Ðµ. Ð?Ð°Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ Ð´ÐµÐºÐ° \"Ð ÐµÐ·ÐµÑ?Ð²Ð¸Ñ?Ð°Ð½Ð¾\" Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¾Ñ? Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ðµ\nÐ½Ð°Ñ?ÐµÑ?ÐµÐ½ \"Ð?ÐµÑ?Ð°Ñ?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¾\" Ð²Ð¾ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ¸Ñ?Ðµ Ð½Ð° %sÐ±Ð°Ð·ÐµÐ½Ð¾Ñ? Ð½Ð° Ð¼Ð¾Ñ?Ñ? Ð´Ð¾Ð´ÐµÐ»Ñ?Ð²Ð°Ñ?Ð°%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?Ð¸Ñ?Ñ?Ð¾"
+
+#: bridgedb/strings.py:138
+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.\nÐ¢Ð¾Ð° Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð½Ð¾Ñ?Ñ? Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ð¸Ñ?Ð°Ð°Ñ? Ð½Ð¸Ð²Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð´Ð¾\nÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ?Ðµ. Ð?Ð°Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ Ð´ÐµÐºÐ° Ð²Ð¾ Ð?Ñ?ÐµÐ±Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð ÐµÐ»Ðµ, Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÐ½Ð¸ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð¸ Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð°\nÐ½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²ÐµÐ»Ð°Ñ? \"Ð?Ð¸Ñ?Ñ?Ð¾\" Ð·Ð° Ð½Ð°Ñ?Ð¼Ð½Ð¾Ð³Ñ? Ð´Ð¾ ÐµÐ´ÐµÐ½ Ð´ÐµÐ½. Ð?Ð¸Ð´ÐµÑ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¸Ð²Ð¸, Ð¸\nÑ?Ð¾Ð³Ð°Ñ? Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸ Ð²Ð¾ ÐºÐ¾Ð½ÐºÑ?ÐµÑ?Ð½Ð¸Ð¾Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð°Ð¼ Ð½Ð° Ð´Ð¸Ñ?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ð° Ð¼Ð¾Ñ?Ñ?.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð·Ð° Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð»Ð¸ Ñ?Ð¸ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ð½Ðµ Ð³Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ñ?Ð»Ð¸ÐºÐ¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð½ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ ÐºÐ°Ñ?Ð°ÐºÑ?ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´ Ñ?Ð»Ð¸ÐºÐ°Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ñ?Ðµ:"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð?Ð° Ð²Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Tor Browser, Ð¿Ñ?Ð²Ð¾ Ð¾Ð´ÐµÑ?Ðµ Ð½Ð° %s Tor Browser Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ\nÑ?Ñ?Ñ?Ð°Ð½Ð°Ñ?Ð° %s Ð¸ Ð¿Ð¾Ñ?Ð¾Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ð?Ñ?Ð²Ð¾, Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð³Ð¾ %sÐ¿Ñ?ÐµÐ·ÐµÐ¼ÐµÑ?Ðµ Tor Browser%s. Ð?Ð°Ñ?ÐµÑ?Ð¾ Ð£Ð¿Ð°Ñ?Ñ?Ñ?Ð²Ð¾ Ð·Ð° \nÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð° Tor Browser Ð¾Ð±Ñ?Ð°Ñ?Ð½Ñ?Ð²Ð° ÐºÐ°ÐºÐ¾ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ?Ðµ Ð²Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Tor Browser. Ð?ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ\nWindows, Linux, Ð¸Ð»Ð¸ OS X, %sÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð¾Ð²Ð´Ðµ%s Ð·Ð° Ð´Ð° Ð½Ð°Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ. Ð?ÐºÐ¾\nÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Android, %sÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð¾Ð²Ð´Ðµ%s. "
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?Ð¾Ð³Ð° Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³Ð¾Ñ? 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸' Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ\nÐ³Ð¾ Ð¸Ð½Ñ?Ñ?Ð°Ð»ÐµÑ?Ð¾Ñ? Ð´Ð¾Ð´ÐµÐºÐ° Ð´Ð° Ð²Ðµ Ð¿Ñ?Ð°Ñ?Ð°:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Ð?Ð¾Ð´Ð°Ð´ÐµÑ?Ðµ Ð³Ð¸ Ð¾Ð²Ð¸Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Ð²Ð°Ñ?Ð¸Ð¾Ñ? Tor Browser Ñ?Ð¾ Ð¾Ñ?Ð²Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ\nÐ½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?, ÐºÐ»Ð¸ÐºÐ½Ñ?Ð²Ð°Ñ?Ñ?Ð¸ Ð½Ð° \"Tor\", Ð¸ Ð¿Ð¾Ñ?Ð¾Ð° Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ñ?Ð¸ Ð³Ð¸ Ð²Ð¾ Ð¿Ð¾Ð»ÐµÑ?Ð¾ \n\"Ð?Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð¼Ð¾Ñ?Ñ?\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð½ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? Ð¿Ñ?Ð¸ÐºÑ?Ð¸ÐµÐ½Ð¸ Tor Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð¡Ð»ÐµÐ´Ð½Ð¾'. Ð?Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ·Ð°Ð»ÐµÐ¿ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð¾Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ð»ÐµÑ?Ð¾. Ð?Ð° ÐºÑ?Ð°Ñ? ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð¾Ð²Ñ?Ð·Ð¸', Ð¸\nÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ñ?Ðµ Ñ?Ð¾ ÐºÐ»Ð¸ÐºÐ°Ñ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÐºÐ¾Ð¿Ñ?ÐµÑ?Ð¾ Ð²Ð¾ 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ð¾Ð²Ð°Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° IPv6 Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Pluggable Transport Ð¿Ð¾ Ñ?Ð¸Ð¿."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? IPv6 Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð° Ð¾Ð´ Ñ?Ð°Ð²Ð½Ð¸Ð¾Ñ? GnuPG ÐºÐ»Ñ?Ñ? Ð½Ð° BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Ð?Ð¾Ð±Ð°Ñ?Ð°Ñ? obfs4 Ð¿Ñ?Ð¸ÐºÑ?Ð¸ÐµÐ½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸.)"
diff --git a/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..3251860
--- /dev/null
+++ b/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,404 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Abhishek C <abhishek.mvr@xxxxxxxxxxx>, 2018
+# Aman Anifer <amananiferfiaff@xxxxxxxxx>, 2020
+# ameer pb <ameerpbekm@xxxxxxxxx>, 2019
+# Christy K Kurian <christykurian2494@xxxxxxxxx>, 2018
+# NITHIN <nithinsn@xxxxxxxxxxxxxx>, 2018
+# Salman Faris <farissalmannbr@xxxxxxxxx>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à´?àµ?à´·à´®à´¿à´?àµ?à´?àµ?! à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?à´¯àµ¼à´¤àµ?à´¥à´¨à´¯à´¿àµ½ à´¤àµ?à´±àµ?à´±àµ?à´£àµ?à´?àµ? "
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à´à´¾à´· "
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "à´?à´°àµ? à´¬à´?àµ? à´±à´¿à´ªàµ?à´ªàµ?à´¾àµ¼à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¯àµ?à´?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "à´¸àµ?à´¾à´´àµ?à´¸àµ? à´?àµ?à´¾à´¡àµ?"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "à´®à´¾à´±àµ?à´± à´µà´¿à´µà´°à´ªàµ?à´ªà´?àµ?à´?à´¿à´? "
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à´?à´²àµ?à´²à´¾à´? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr " QRCode à´?à´¾à´£à´¿à´?àµ?à´?àµ?à´?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´¾à´²à´? à´²àµ?à´¨àµ?à´?àµ¾ à´µàµ?à´£àµ?à´?à´¿ QRCode"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?à´¯àµ? à´?àµ¼ à´?àµ?à´¡àµ? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿àµ½ à´?à´°àµ? à´ªà´¿à´¶à´?àµ? à´¸à´?à´à´µà´¿à´?àµ?à´?àµ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à´?àµ? QR à´?àµ?à´¡à´¿àµ½ à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´²àµ?àµ» à´?à´?à´?àµ?à´?à´¿à´¯à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?. à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´®àµ?à´¬àµ?àµ½ à´«àµ?à´£à´¿à´²àµ?à´?àµ?à´?àµ? à´®à´±àµ?à´±àµ? à´?à´ªà´?à´°à´£à´?àµ?à´?à´³à´¿à´²àµ?à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´²àµ?àµ» à´?àµ?à´ªàµ?à´ªà´¿ à´?àµ?à´¯àµ?à´¯àµ?à´µà´¾àµ» à´?à´¤àµ? à´?à´°àµ? QR à´?àµ?à´¡àµ? à´±àµ?à´¡à´±à´¿à´¨àµ?à´±àµ? à´¸à´¹à´¾à´¯à´¤àµ?à´¤àµ?à´?àµ? à´¸àµ?à´?à´¾àµ» à´?àµ?à´¯àµ?à´¯àµ?à´?."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "à´¤àµ½à´¸à´®à´¯à´? à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´? à´²à´àµ?à´¯à´®à´²àµ?à´²."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à´?à´¿à´²à´ªàµ?à´ªàµ?àµ¾ à´¤à´¾à´?àµ?à´?àµ¾ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? 1%s à´ªàµ?à´±à´?à´¿à´²àµ?à´?àµ?à´?àµ? à´ªàµ?à´¯à´¿ 1%s à´®à´±àµ?à´±àµ?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? "
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ %s  à´¡àµ?àµºà´²àµ?à´¡àµ? à´?àµ?à´¯àµ?à´¯àµ?à´? %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "à´?à´¨à´¿ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ?à´±à´¿ à´²àµ?à´?àµ? à´?àµ?à´?àµ?à´?à´¿à´?àµ?à´?àµ?àµ¼à´?àµ?à´?àµ?à´? %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¤à´°àµ?à´? %sÂ "
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "à´?àµ?à´?àµ?à´¤àµ½ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾ "
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "à´µàµ?à´£àµ?à´?"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "à´?à´¨àµ?à´¨àµ?à´®à´¿à´²àµ?à´²"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%s à´¶àµ?à´°à´¿  %s "
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´?àµ?à´?àµ?à´?àµ?à´? %s "
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "à´?à´¤à´¾à´£àµ? à´¤à´¾à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ "
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´£à´?àµ?à´?à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨ à´ªà´°à´¿à´§à´¿ à´?à´¤à´¿à´?àµ?à´°à´®à´¿à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?. à´¦à´¯à´µà´¾à´¯à´¿ à´µàµ?à´?à´? à´?àµ?à´±à´?àµ?à´?àµ?à´? !  à´?à´®àµ?à´¯à´¿àµ½ à´²à´à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ?à´³àµ?à´³ à´?àµ?à´±à´?àµ?à´? à´¸à´®à´¯à´? à´®à´£à´¿à´?àµ?à´?àµ?à´±àµ?à´?à´³à´¾à´£àµ? %s . à´? à´¸à´®à´¯à´¤àµ?à´¤àµ? à´µà´¿à´¶àµ?à´·à´¿à´?àµ?à´? à´?à´®àµ?à´¯à´¿à´²àµ?à´?àµ¾ à´?à´µà´?à´£à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¾à´£àµ?Â "
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "à´?à´?àµ?à´?à´¾à´£àµ?à´¨àµ?à´¨ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´²àµ?à´² à´¨à´¿à´?àµ?à´?àµ¾à´?àµ?à´?àµ? à´µàµ?à´£àµ?à´?à´¤àµ?à´?àµ?à´?à´¿àµ½, à´¤à´¾à´´àµ? à´¤à´¨àµ?à´¨à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¤àµ?à´?àµ?à´?à´¿à´²àµ?à´? à´?à´°àµ? à´?à´®à´¾àµ»à´¡àµ? à´®àµ?à´¸àµ?à´¸àµ?à´?àµ? à´¬àµ?à´¡à´¿à´¯à´¿àµ½ à´?à´´àµ?à´¤à´¿ à´?à´®àµ?à´²à´¿à´¨àµ? à´®à´±àµ?à´ªà´?à´¿ à´?à´¯à´¿ à´?à´¯à´?àµ?à´?àµ?à´?"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿à´¬à´¿à´?àµ?à´?àµ? à´ªà´² à´¤à´°à´¤àµ?à´¤à´¿àµ½ à´?à´³àµ?à´³ à´ªàµ?à´³à´?àµ?à´?àµ?â??à´¬à´¿àµ½ à´?àµ?à´°à´¾àµ»à´¸àµ?â??à´ªàµ?àµ¼à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ %s à´¤à´°à´ªàµ?à´ªàµ?à´?àµ?à´¤àµ?à´¤à´¾àµ» à´?à´´à´¿à´¯àµ?à´? %s,  à´?à´¤à´¿à´¨àµ? à´?àµ?àµ¼ à´¶àµ?à´?à´?à´²à´¯à´¿à´²àµ?à´?àµ?à´?àµ?à´³àµ?à´³ à´¬à´¨àµ?à´§à´? à´?à´°àµ?à´?àµ?à´?à´¾à´?àµ?à´?à´¾àµ» à´¸à´¹à´¾à´¯à´¿à´?àµ?à´?àµ?à´?, à´?à´¤àµ? à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´?à´¤à´¾à´?à´¤à´? à´?à´£àµ?à´?àµ?à´?àµ?à´£àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¤àµ?à´°à´¾àµ¾à´?àµ?à´?àµ?à´? à´¨à´¿à´?àµ?à´?àµ¾ à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´±àµ?â??à´µàµ¼à´?àµ?à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´?à´¯à´¾à´£àµ? à´?à´²àµ?à´²à´¯àµ? à´?à´¨àµ?à´¨àµ? à´®à´¨à´¸àµ?à´¸à´¿à´²à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤àµ? à´?àµ?à´?àµ?à´¤àµ½ à´¦àµ?à´°à´¿à´¤à´ªàµ?àµ¼à´£à´? à´?à´?àµ?à´?à´¾àµ» à´?à´´à´¿à´¯àµ?à´?Â \n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "à´? à´ªà´¿ à´µà´¿ 6 à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´²à´àµ?à´¯à´®à´¾à´£àµ? , à´?à´¨àµ?à´¨à´¿à´°àµ?à´¨àµ?à´¨à´¾à´²àµ?à´? à´?à´¿à´² à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ \nà´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?àµ¾ à´? à´ªà´¿ à´µà´¿ à´¸à´¿à´?àµ?à´¸àµ? à´ªàµ?à´°àµ?à´¤àµ?à´¤à´? à´?à´³àµ?à´³à´¤à´²àµ?à´²Â \n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "à´?àµ?à´?à´¾à´¤àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿à´¬à´¿à´?àµ?à´?àµ? à´?à´¨à´µà´§à´¿ à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ à´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?àµ¾ %s à´?à´²àµ?à´²à´¾à´¤àµ?à´¤ à´ªàµ?à´²àµ?à´¯à´¿àµ» à´?àµ¾ à´µà´¾à´¨à´¿à´² à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ %s à´?à´£àµ?à´?àµ?  \nà´?à´¤àµ? à´?àµ?àµ¾à´?àµ?à´?à´¾àµ» à´?à´¤àµ?à´° à´°à´¸à´? à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿à´²àµ?à´? \nà´?à´µà´¯àµ?à´?àµ?à´?àµ? à´ªà´² à´¸à´¾à´¹à´?à´°àµ?à´¯à´¤àµ?à´¤à´¿à´²àµ?à´?  à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´¸àµ?àµ»à´¸àµ¼à´·à´¿à´ªàµ? à´?à´´à´¿à´µà´¾à´µà´¾à´?àµ?à´?à´¾àµ» à´ªà´±àµ?à´±àµ?à´? \n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "à´?à´¨àµ?à´¤àµ?à´?àµ?à´?àµ?à´¯à´¾à´£àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ ?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ %s à´?à´¨àµ?à´¨àµ? à´ªà´±à´¯àµ?à´¨àµ?à´¨à´¤àµ? à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´¸àµ?à´¨àµ?à´¸à´°àµ?à´·à´¿à´ªàµ? à´?à´´à´¿à´µà´¾à´?àµ?à´?à´¾à´¨à´¾à´¯à´¿à´?àµ? à´®à´¾à´±à´¿ à´®à´¾à´±à´¿ à´?à´¯à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?àµ?à´±à´¿à´¨àµ?à´± à´¸à´?à´?à´?àµ?à´?à´³à´¾à´£àµ? "
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "à´?à´¨à´¿à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´¿à´?àµ?à´?à´¾àµ» à´?à´¨àµ?à´¨à´¿à´?à´µà´¿à´?àµ?à´?àµ?à´³àµ?à´³ à´µà´´à´¿à´?àµ¾ à´µàµ?à´£à´? "
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "à´?à´¨àµ?à´±àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´² ! à´?à´¨à´¿à´?àµ?à´?àµ? à´¸à´¹à´¾à´¯à´? à´?à´µà´¶àµ?à´¯à´®à´¾à´£àµ? !"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸à´±àµ?à´®à´¾à´¯à´¿ à´¬à´¨àµ?à´§à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?à´¾àµ» à´?à´´à´¿à´¯àµ?à´¨àµ?à´¨à´¿à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½, à´¦à´¯à´µà´¾à´¯à´¿ %s à´?à´? à´?à´?àµ?à´?à´³àµ?à´?àµ? %s à´?à´? à´¨àµ?à´?àµ?à´?àµ?à´?."
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "à´?à´¤à´¾à´£àµ? à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´?àµ?à´?à´¿à´? :"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? "
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´¿à´¤à´°à´£ à´¸à´?à´µà´¿à´§à´¾à´¨à´?"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "à´?à´¨àµ?à´¨àµ?à´®à´¿à´²àµ?à´²"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "à´¦à´¯à´µà´¾à´¯à´¿ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´?à´àµ?à´¦à´?àµ?à´?àµ¾ à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? :"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´? à´ªà´¿ à´µà´¿ 6 à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ??"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´?à´°àµ? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ? %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´¿à´¤àµ?à´°à´?àµ?à´?àµ¾ à´µàµ?à´£àµ?à´? à´°àµ?à´¤à´¿à´¯à´¿àµ½ à´ªàµ?à´°à´¦à´°àµ?à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´² ."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr " à´®àµ?à´?à´³à´¿àµ½ à´?à´¾à´£àµ?à´¨àµ?à´¨ à´?à´¿à´¤àµ?à´°à´¤àµ?à´¤à´¿àµ½ à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´?àµ?à´·à´°à´?àµ?à´?àµ¾ à´?àµ?àµ¼à´?àµ?à´?àµ?à´? "
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "à´?à´?àµ?à´?à´¨àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ? à´¤àµ?à´?à´?àµ?à´?àµ?à´? "
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(à´µàµ?à´¯à´?àµ?à´¤à´®à´²àµ?à´²à´¾à´¤àµ?à´¤ à´?àµ?àµ¼ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?à´ªàµ?à´ªà´?à´¿à´?àµ?à´?àµ?à´?)"
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..f0141d9
--- /dev/null
+++ b/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,400 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Prachi Joshi <josprachi@xxxxxxxxx>, 2019
+# Vikrant Korde <vikrant.korde@xxxxxxxxx>, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à¤?à¥?à¤·à¤®à¤¸à¥?à¤µ! à¤?à¤¾à¤¹à¥?à¤¤à¤°à¥? à¤?à¥?à¤? à¤?à¤¾à¤²à¥? à¤?à¤¹à¥?"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¤à¤¾à¤·à¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "à¤¦à¥?à¤· à¤¨à¥?à¤?à¤¦à¤µà¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "à¤¸à¥?à¤?à¤°à¥?à¤¸ à¤?à¥?à¤¡"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "à¤¬à¤¦à¤² à¤²à¥?à¤?"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à¤¸à¤°à¥?à¤µ à¤¨à¤¿à¤µà¤¡à¤¾"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡ à¤¦à¤°à¥?à¤¶à¤µà¤¾"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "à¤?à¥?à¤¯à¥? à¤?à¤° à¤?à¥?à¤¡ à¤®à¤¿à¤³à¤µà¤¤à¤¾à¤¨à¤¾ à¤?à¤¡à¤¬à¤¡ à¤?à¤¾à¤²à¥?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "à¤®à¤¿à¤³à¤µà¤¤à¤¾à¤¨à¤¾ à¤?à¤¡à¤¬à¤¡ à¤?à¤¾à¤²à¥?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à¤¹à¥?à¤¯à¤¾ QR à¤?à¥?à¤¡ à¤®à¤§à¥?à¤¯à¥? à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥? à¤?à¤¹à¥?à¤¤. à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥? à¤®à¥?à¤¬à¤¾à¤?à¤² à¤?à¤£à¤¿ à¤?à¤¤à¤° à¤¸à¤¾à¤§à¤¨à¤¾à¤?à¤µà¤° à¤µà¤°  à¤?à¥?à¤ªà¥? à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? QR à¤?à¥?à¤¡ à¤µà¤¾à¤?à¤?à¤¾à¤¨à¥? à¤¸à¥?à¤?à¥?à¤¨ à¤?à¤°à¤¾."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "à¤¸à¤§à¥?à¤¯à¤¾ à¤?à¥?à¤£à¤¤à¥?à¤¹à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¾à¤¹à¥?à¤¤ ... "
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à¤¤à¥?à¤®à¥?à¤¹à¥? %s à¤®à¤¾à¤?à¥? %s à¤?à¤¾à¤?à¤¨ à¤¦à¥?à¤¸à¤°à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤¨à¤¿à¤µà¤¡à¤¾à¤µà¤¾"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ %s à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "à¤?à¤¤à¤¾ %s à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤®à¤§à¥?à¤¯à¥? à¤?à¤¾à¤?à¤¾ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sà¤®%sà¤²à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤¦à¥?à¤¯à¤¾!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "à¤ªà¥?à¤°à¤?à¤¤ à¤ªà¤°à¥?à¤¯à¤¾à¤¯"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "à¤¨à¤¾à¤¹à¥?"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "à¤?à¤¾à¤¹à¥?à¤¹à¥? à¤¨à¤¾à¤¹à¥?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sà¤¹à¥?%sà¤¯!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "à¤¯à¥?à¤¥à¥? à¤?à¤ªà¤²à¤¾ à¤ªà¥?à¤² à¤?à¤¹à¥?:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "à¤?à¤ªà¤£ à¤®à¤°à¥?à¤¯à¤¾à¤¦à¤¾ à¤?à¤²à¤¾à¤?à¤¡à¤²à¥? à¤?à¤¹à¥?. à¤¥à¥?à¤¡à¤¾ à¤µà¥?à¤³ à¤¥à¤¾à¤?à¤¬à¤¾! à¤¦à¥?à¤¨ à¤®à¥?à¤² à¤®à¤§à¥?à¤² à¤?à¤?à¤¤à¤° %s à¤¤à¤¾à¤¸ à¤?à¤¹à¥?. à¤ªà¥?à¤¢à¥?à¤² à¤¸à¤°à¥?à¤µ à¤?-à¤®à¥?à¤²à¥?à¤¸ à¤?à¤¡à¥? à¤¦à¥?à¤°à¥?à¤²à¤?à¥?à¤· à¤?à¥?à¤²à¥? à¤?à¤¾à¤?à¤²."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "à¤?à¤¾à¤¹à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ IPv6 à¤µà¤° à¤¦à¥?à¤?à¥?à¤² à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤?à¤¹à¥?à¤¤, à¤ªà¤£ à¤?à¤¾à¤¹à¥? à¤ªà¥?à¤²à¤?à¥?à¤¬à¤²\nà¤?à¥?à¤°à¤¾à¤?à¤¸à¥?à¤ªà¥?à¤°à¥?à¤? à¤¸à¥?à¤¸à¤?à¤?à¤¤ à¤¨à¤¾à¤¹à¥?à¤¤.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤®à¥?à¤¹à¤£à¤?à¥? à¤?à¤¾à¤¯?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "à¤®à¤²à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤®à¤¿à¤³à¤µà¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? à¤ªà¤°à¥?à¤¯à¤¾à¤¯à¥? à¤®à¤¾à¤°à¥?à¤? à¤¹à¤µà¤¾ à¤?à¤¹à¥?!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "à¤®à¤¾à¤?à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¾à¤°à¥?à¤¯ à¤?à¤°à¤¤ à¤¨à¤¾à¤¹à¥?! à¤®à¤²à¤¾ à¤®à¤¦à¤¤ à¤¹à¤µà¥? à¤?à¤¹à¥?!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥?"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "à¤¬à¥?à¤°à¤¿à¤? à¤ªà¥?à¤°à¤?à¤¾à¤°à¤¾à¤¤à¥?à¤² à¤ªà¤°à¥?à¤¯à¤¾à¤¯ à¤¨à¤¿à¤µà¤¡à¤¾:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "à¤?à¤ªà¤£à¤¾à¤¸ IPv6 à¤ªà¤¤à¥?à¤¤à¥? (addresses) à¤¹à¤µà¥? à¤?à¤¹à¥?à¤¤ à¤?à¤¾? "
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "à¤?à¤ªà¤£à¤¾à¤¸ %s à¤¹à¤µà¥? à¤?à¤¹à¥? à¤?à¤¾?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "à¤?à¤ªà¤²à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤ªà¥?à¤°à¤¤à¤¿à¤®à¤¾ à¤¨à¥?à¤? à¤¦à¤¾à¤?à¤µà¤¤ à¤¨à¤¾à¤¹à¥?. "
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "à¤µà¤°à¥?à¤² à¤ªà¥?à¤°à¤¤à¤¿à¤®à¥?à¤¤à¥?à¤² à¤¶à¤¬à¥?à¤¦ à¤²à¤¿à¤¹à¤¾"
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "à¤?à¤ªà¤²à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¸à¥? à¤µà¤¾à¤ªà¤°à¤¾à¤µà¥?à¤¤"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
index ca9505f..45f6298 100644
--- a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # abuyop <abuyop@xxxxxxxxx>, 2017
@@ -15,116 +15,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-09 01:07+0000\n"
-"Last-Translator: abuyop <abuyop@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Bahasa"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Lapor kesilapan kod"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kod Sumber"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Sejarah log"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kenalan"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tunjuk Kod QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Kod untuk talian 'bridge'"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Alamak, spaghettios!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Terdapat ralat ketika cuba mendapatkan KodQR anda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk membuat salinan talian 'bridge' ke mobil dan alat-alat lain"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Tidak ada alat 'bridge' pada masa ini..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Anda boleh cuba %s balik ke %s dan pilih jenis 'bridge' lain!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Langkah %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Muat turun%s Pelayar Web Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Langkah%s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s titi %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah%s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
@@ -133,27 +148,27 @@ msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sPilih%s secara automatik 'bridges'!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Pilihan Lanjutan"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "tiada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -161,69 +176,37 @@ msgstr "%sY%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%suna Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah mesej automatik; tidak perlu balas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ini adalah titi anda:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Awak telah mencapai had yang ditetapkan. Harap bersabar! Masa minimum yang ditetapkan diantara email adalah %s jam. Mana-mana emel yang di hantar pada masa ini tidak akan dilayan."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (cantum COMMANDs untuk mendapat lebih dari satu pilihan dalam satu)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Selamat Datang ke BridgeDB"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "JENIS angkutan semasa yang disokong:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hai, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hai, kawan!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Kunci Awam"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Email ini dihasilkan dengan pelangi,kuda bertanduk satu, dan kelipan untuk %s diatas %s pada %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +217,7 @@ msgid ""
 msgstr "BridgeDB boleh memberi sambungan 'bridge' dengan beberapa %sjenis  sambungan (Pluggable Transports)%s,\nyang boleh meyembungi hubungan anda dalam Rangkaian Tor, yang membolehkan rangkaian anda dilindungi daripada pihak awam yang menapis litar Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -246,7 +229,7 @@ msgstr "Bridge tertentu dengan alamat-alamat IPv6  juga boleh didapati, walaupun
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +238,169 @@ msgid ""
 "\n"
 msgstr "Selain itu, BridgeDB mempunyai banyak bridges yang dicadang %stanpa diperlukan\nPluggable Transports %s yang boleh memberi rasa tidak sedap, tetapi ia masih boleh menolong rangkaian anda dilindungi dalam kebanyakan kes.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Apakah itu 'bridges'?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s adalah sambungan Tor yang menolong anda dari tapisan internet."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Cara lain untuk dapatkan bridge adalah untuk menghantar email kepada %s. Sila ambil perhatian anda harus\nmenghantar email dengan mengunakan alamat yang diberi oleh syarikat yang menyediakan email:\n%s,%s atau %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Sila beri sebanyak mungkin informasi tentang kes anda, sila beri kandungan senarai bridge dan hubungan Pluggable Transport yang telah diguna, versi Pelayar Web Tor, dan segala mesej yang Tor paparkan, dan lain-lain .. "
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Berikut adalah bridge anda:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Dapat sambungan Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Tiada"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Sila pilih jenis bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Anda perlukan alamat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Perlukah anda %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Pelayar anda tidak memaparkan imej dengan betul."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan imej aksara yang tertera..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Bagaimana cara untuk mula mengunakan bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Untuk 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 "
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Adakah Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Pilih 'Ya' dan klik 'langkah seterusnya'. Untuk konfigurasi bridge baru, buat salinan jaringan bridges ke dalam kotak input teks. Step akhir, klik 'Hubung', dan anda patut dapat keputusan positif! Jika anda ada kesulitan, sila cuba klik 'Bantuan' dalam 'Tor Network Settings' guru untuk bantuan seterusnya"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Papar mesej ini."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Pinta bridges yang disyorkan."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pinta IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pinta jalinan Pluggable Transport secara TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
index 60e81a7..7f829a5 100644
--- a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
@@ -1,131 +1,150 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2014
 # Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2016-2017
+# Arne Fjotland Holmen <afjo@xxxxxxxxxxxxxx>, 2020
 # Erik Matson <erik@xxxxxxxxxxxxxxx>, 2015
 # Harald H. <haarektrans@xxxxxxxxx>, 2014
 # Kristian Andre Henriksen <kris.andre.h@xxxxxxxxx>, 2015
+# LarsMagnusHerland <lars.magnus@xxxxxxxxxxxxxxx>, 2020
 # 81149148127a5edca7d06dcbfba79969, 2013
+# 09d0a572947e2a725c5d26b354f13c4c, 2019
 # PÃ¥l Fiksdal <plf715@xxxxxxxxx>, 2015
-# Per Thorsheim <transifex@xxxxxxxxxxxxx>, 2015
+# Per Thorsheim, 2015
 # thor574 <thor.hovden@xxxxxxxxx>, 2014
+# eab1793e5400043c122a2435c33fe68d, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-12-29 18:29+0000\n"
-"Last-Translator: Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Innrapporter feil"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Endringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Velg alt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Vis QR-kode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kode for dine brolinjer"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Oisann!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det oppsto en feil ved innhenting av din QR-kode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+msgstr "Denne QR-koden inneholder dine brolinjer. Skann den med en QR-leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Det er for tiden ingen tilgjengelige broerâ?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Last ned %s Tor-nettleseren %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Tilknytt %s broer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
@@ -134,27 +153,27 @@ msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare gi meg noen broer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avanserte valg"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -162,69 +181,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sT%silknytt broer"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisert melding; ikke svar.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dette er en automatisk e-post.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Her er dine broer:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Du har overskredet hastighetsbegrensningen. Ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre e-poster i denne tidsperioden vil bli ignorert."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOer: (kombiner KOMMANDer to Ã¥ angi flere valg samtidig)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkommen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "NÃ¥vÃ¦rende stÃ¸ttede transport TYPEr:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, lille venn!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlige nÃ¸kler"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-posten ble laget med regnbuer, enhjÃ¸rninger og stjerneskudd for %s pÃ¥ %s klokken %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Om disse broene ikke er det du trenger, svar pÃ¥ denne e-posten med en av\nfÃ¸lgende kommandoer i meldingsteksten:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +222,7 @@ msgid ""
 msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med Ã¥ tilslÃ¸re dine tilkoblinger til Tor-nettverket, noe som gjÃ¸r det\nvanskelig for noen som overvÃ¥ker din internett-trafikk Ã¥ fastsette hvorvidt du\nbruker Tor eller ei\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -247,7 +234,7 @@ msgstr "Noen broer med IPv6-adresser er ogsÃ¥ tilgjelgelige, dog er noen pluggba
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +243,169 @@ msgid ""
 "\n"
 msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av Internettsensur i de fleste fall.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Hva er broer?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Broer %s er Tor-rutingsstafettoppsett som hjelper deg med Ã¥ omgÃ¥ sensur."
+msgstr "%s Broer %s er Tor-relÃ©oppsettet som hjelper deg med Ã¥ omgÃ¥ sensur."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg trenger en alternativ mÃ¥te Ã¥ fÃ¥ broer pÃ¥!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "En annen mÃ¥te tilknytte seg broer er Ã¥ sende en e-post til %s. Merk at du mÃ¥ sende\ne-post fra en adresse tilhÃ¸rende en av fÃ¸lgende e-posttilbydere:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "En annen mÃ¥te Ã¥ tilknytte seg broer pÃ¥ er Ã¥ sende en e-post til %s. Merk at du mÃ¥\nsende e-posten fra en adresse tilhÃ¸rende en av fÃ¸lgende e-post-tilbydere:\n%s eller %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte ha produsert, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Hvis Tor-nettleseren ikke kan koble til, kan du ta en titt pÃ¥ %s og vÃ¥r %s. "
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Tilknytt broer!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "Reservert"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Hvordan starte med bruk av dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "For Ã¥ sette opp broer i Tor-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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Vis denne meldingen."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "EtterspÃ¸r IPv6-broer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Be om en pluggbar transport etter TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "FÃ¥ kopi av BridgeDBs offentlige GnuPG-nÃ¸kkel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 62ada3b..71c26fc 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
 # AndrÃ© Koot <meneer@xxxxxxxx>, 2016
 # Ann Boen <ann.boen@xxxxxxxxx>, 2014
@@ -12,130 +11,147 @@
 # Dick, 2014
 # Johann Behrens <info@xxxxxxxxxxxxxx>, 2013
 # Joren Vandeweyer <jorenvandeweyer@xxxxxxxxx>, 2019
+# kwadronaut <kwadronaut@xxxxxxxxxxxxx>, 2019
 # 53a60eabbf5124a226a7678001f9a57b, 2015
 # Meteor0id, 2019
+# Meteor0id, 2019-2020
 # Not Much <1028484728393@xxxxxxxxxxxxxx>, 2018
 # Shondoit Walker <shondoit@xxxxxxxxx>, 2011
 # Marco Brohet <inactive+therbom@xxxxxxxxxxxxx>, 2012
 # Tom Becht <tombecht@xxxxxxx>, 2014
 # Tonko Mulder <tonko@xxxxxxxxxxxxxx>, 2015
-# Tonnes <tonnes.mb@xxxxxxxxx>, 2019
+# Tonnes <tonnes.mb@xxxxxxxxx>, 2019-2020
 # math1985 <transifex@xxxxxxxxxxxxxxxxxxx>, 2013
 # BBLN <webmaster@xxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-09 13:57+0000\n"
-"Last-Translator: Meteor0id\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Een bug melden"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Lijst van wijzigingen"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode tonen"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode voor uw bridge regels"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Er was een fout tijdens het ophalen van uw QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiÃ«ren naar mobiele of andere apparaten."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Stap %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
-msgstr ""
+msgstr "%sBridges%s verkrijgen"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
@@ -144,27 +160,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
-msgstr ""
+msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -172,69 +188,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%srijg Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dit is een geautomatiseerd e-mailbericht.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Hier zijn je bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr ""
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr ""
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr ""
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr ""
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr ""
+msgstr "U hebt de snelheidslimiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails tijdens deze periode worden genegeerd."
 
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Als deze bridges niet zijn wat u nodig hebt, beantwoord dit e-mailbericht\ndan met een van de volgende opdrachten in de hoofdtekst van het bericht:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -242,158 +226,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr ""
+msgstr "BridgeDB kan bridges met meerdere %stypen Pluggable Transports%s aanbieden,\ndie kunnen helpen bij het verduisteren van uw verbindingen met het Tor Network, waardoor het\nmoeilijker wordt voor anderen om uw internetverkeer te bekijken en vast te stellen dat u\nTor gebruikt.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr ""
+msgstr "Er zijn ook enkele bridges met IPv6-adressen beschikbaar, hoewel sommige Pluggable\nTransports niet IPv6-compatibel zijn.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr ""
+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/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Bridges %s zijn Tor-relays die u helpen censuur te omzeilen."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Een andere manier om bridges te verkrijgen is een e-mail sturen naar %s. Laat het\nonderwerp van de e-mail leeg en schrijf 'get transport obfs4' in de berichttekst van de e-mail. Houd er\nrekening mee dat u de e-mail moet sturen door gebruik te maken van een adres van een van de volgende\n e-mailproviders: %s of %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Als uw Tor Browser geen verbinding kan maken, bekijk dan de %s en onze %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Dit zijn uw bridge-regels:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr ""
+msgstr "Bridges verkrijgen!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Bridge-distributiemechanismen"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementeert vier mechanismen voor het distribueren van bridges: 'HTTPS', 'Moat',\n'Email' en 'Reserved'. Bridges die niet via BridgeDB worden gedistribueerd,\ngebruiken het pseudomechanisme 'None'. De volgende lijst geeft een korte uitleg\nover hoe mechanismen werken, en onze %smetrische gegevens over BridgeDB%s\nvisualiseren hoe populair elk van deze mechanismen is."
+
+#: bridgedb/strings.py:115
+#, 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 "Het distributiemechanisme 'HTTPS' deelt bridges uit via deze website. Ga naar\n%sbridges.torproject.org%s, selecteer de opties van uw voorkeur en los\nde daaropvolgende CAPTCHA op om bridges te verkrijgen."
+
+#: bridgedb/strings.py:119
+#, 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 "Het distributiemechanisme 'Moat' is onderdeel van Tor Browser, waardoor\ngebruikers bridges kunnen aanvragen vanuit hun Tor Browser-instellingen. Om\nbridges te verkrijgen, gaat u naar de %sTor-instellingen%s van uw Tor Browser,\nklik op 'Een nieuwe bridge aanvragen', los de daaropvolgende CAPTCHA op, en\nTor Browser voegt automatisch uw nieuwe bridges toe."
+
+#: bridgedb/strings.py:125
+#, 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 "Gebruikers kunnen bridges uit het distributiemechanisme 'Email' aanvragen door een e-mailbericht\nnaar %sbridges@xxxxxxxxxxxxxx%s te sturen en 'get transport obfs4' in de hoofdtekst\nvan het e-mailbericht te schrijven."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Gereserveerd"
+
+#: bridgedb/strings.py:130
+#, 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 beheert een klein aantal bridges die niet automatisch\nworden gedistribueerd.\nIn plaats daarvan reserveren we deze bridges voor handmatige distributie en\ndelen we deze uit aan NGO's en andere organisaties en personen die bridges nodig\nhebben. Bridges die via het mechanisme 'Reserved' worden gedistribueerd, zien\nmogelijk lange tijd geen gebruikers. Houd er rekening mee dat het distributiemechanisme\n'Reserved' 'Unallocated' wordt genoemd in bestanden voor %sbridge-pooltoewijzing%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:138
+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 waarvan het distributiemechanisme 'None' is, worden niet door BridgeDB gedistribueerd.\nHet is de verantwoordelijkheid van de beheerder van de bridge om zijn of\nhaar bridges naar gebruikers te distribueren. Houd er rekening mee dat bij het\nzoeken naar relays een nieuw opgezet bridgedistributiesysteem tot ongeveer\nÃ©Ã©n dag 'None' aangeeft. Heb een beetje geduld, en dit verandert vanzelf naar\nhet actuele distributiemechanisme van de bridge.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
-msgstr ""
+msgstr "Selecteer opties voor bridge-type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
-msgstr ""
+msgstr "Hebt u IPv6-adressen nodig?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
-msgstr ""
+msgstr "Hebt u een %s nodig?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
-msgstr ""
+msgstr "Uw browser geeft afbeeldingen niet goed weer."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
-msgstr ""
+msgstr "Voer de tekens in van de bovenstaande afbeelding..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
-msgstr ""
+msgstr "Beginnen met het gebruik van uw bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Eerst dient u %sTor Browser te downloaden%s. Onze Tor Browser-\ngebruikershandleiding legt uit hoe u uw bridges aan Tor Browser kunt toevoegen.\n Als u Windows, Linux of OS X gebruikt, %sklik dan hier%s voor meer info.\n Als u Android gebruikt, %sklik dan hier%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Voeg deze bridges toe aan uw Tor Browser door uw browservoorkeuren\nte openen, op 'Tor' te klikken, en ze dan aan het veld 'Een bridge opgeven' toe\nte voegen."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr ""
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Niet-verdoezelde Tor-bridges aanvragen.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr ""
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr ""
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr ""
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr ""
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6-bridges aanvragen.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr ""
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(obfs4-verdoezelde bridges aanvragen.)"
diff --git a/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
index d8fc5c3..eb322fa 100644
--- a/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Katrien Igodt <kigodt@xxxxxxxxx>, 2015
@@ -8,116 +8,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-06-08 07:09+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Rapporteer een Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacteer"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecteer Alles"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Toon QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode voor uw bridge lines"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "t'Is om zeep!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Er lijkt een fout gebeurd te zijn in het verkrijgen van uw QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Deze QRCode bevat uw bridge lines. Scan deze aub met een QRCode lezer om zo uw bridge lines te kopiÃ«ren naar uw mobiele en andere toestellen. "
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar. "
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Misschien moet u proberen %s even terug %s te gaan om een andere bridge type te selecteren."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Stap %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Verkrijg %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
@@ -126,27 +141,27 @@ msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Geavanceerde Opties"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -154,69 +169,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sV%serkrijg Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dit is een geautomatiseerd bericht; gelieve hier niet te op te antwoorden.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Hier zijn uw bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "U hebt de snelheidslimiet overschreden. Gelieve langer te wachten! De minimum tijd tussen emails is %s uur. Alle verdere e-mails zullen tijdens deze tijd niet behandeld worden."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combineer COMMANDs om simultaan meerdere opties te specifiÃ«ren)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Welkom bij BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Huidige ondersteunde transporttype's:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hallo, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, vriend!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Public Keys"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Deze e-mail werd gegenereerd met regenbogen, eenhoorns, en glitters\nvoor %s op %s in %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,7 @@ msgid ""
 msgstr "BridgeDB kan bridges voorzien met verschillende %stypes Pluggable Transports%s, die kunnen helpen om uw connecties met het Tor netwerk te verduisteren, hetgeen het nog moeilijker maakt voor iemand die uw netwerktrafiek bekijkt om te zien dat u Tor gebruikt.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,7 @@ msgstr "Sommige bridges met IPv6 adressen zijn ook beschikbaar, alhoewel sommige
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ msgid ""
 "\n"
 msgstr "Verder heeft BridgeDB standaard bridges %s in overvloed zonder enige Pluggable Transports %s. Dit lijkt allemaal niet zo spannend, maar helpen nog steeds om in de meeste gevallen internetcensuur te omzeilen. \n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s zijn Tor relays die u helpen om censuur te omzeilen."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ik heb een alternatieve route nodig om bridges te verkrijgen!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Een andere manier om bridges te verkrijgen is om een email te sturen naar %s. Gelieve zeker te zijn dat u uw e-mail verstuurt vanuit een e-mailadres van de volgende e-mail providers:\n%s, %s of %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Indien Tor niet werkt, dient u een e-mail te sturen naar %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Probeer zoveel mogelijk informatie mee te geven, \nzoals de lijst van\nbridges en Pluggable Transports die u probeerde te gebruiken, de versie van uw Tor Browser,\nen de meldingen die u verkreeg van Tor, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn uw bridge lines:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Verkrijg Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Gelieve opties te selecteren voor bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Heeft u IPv6 adressen nodig?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heeft u een %s nodig?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser geeft afbeeldingen niet correct weer."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Voer de karakters van de afbeelding hierboven in..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Hoe beginnen met bridges te gebruiken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecteer 'Ja' en klik vervolgens op 'Volgende'. Om uw nieuwe bridges te configureren, kopieer en plak de bridge lines in het tekst invoerveld. Tenslotte, klik 'Connecteer' en u zou moeten kunnen connecteren. Indien u toch problemen ondervindt, klik dan op de 'Help' knop in de 'Tor Netwerk Instellingen' wizard voor verdere ondersteuning."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Toont dit bericht."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Vraag standaard bridges aan."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Vraag IPv6 bridges aan."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Vraag Pluggable Transport by TYPE aan."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Verkijg een kopie van de BridgeDB's public GnuPG key."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
index 76d5ac2..7e5bff4 100644
--- a/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # BjÃ¸rn I., 2014-2015
@@ -9,116 +9,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 19:57+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Orsak! Noko gjekk gale med fÃ¸respurnaden din."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Rapporter feil"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kjeldekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Endringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vel alle"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Vis QR-kode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-for brulinjene dine"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ojsann!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det oppstod ein feil under henting av QR-koden din."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for Ã¥ kopiera brulinjene dine over pÃ¥ mobilen og andre einingar."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ingen bruer er for tida tilgjengelege "
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Kanskje du skulle freista Ã¥ %s gÃ¥ tilbake %s og velja ei anna brutype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Last ned %s Tor-nettlesaren %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hent %s bruer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "No kan du %s leggja til bruene i Tor Browser %s"
@@ -127,27 +142,27 @@ msgstr "No kan du %s leggja til bruene i Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serre gje meg nokre bruer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avanserte innstillingar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -155,69 +170,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%snyt til bruer"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er ei automatisk melding; gjer vel og ikkje svar.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Her er bruene dine:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Du har gÃ¥tt over fartsavgrensinga. Ver snill og ta det med ro! Minste tillaten tid mellom e-postar er %s timar. E-postar utover dette vert ignorerte."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOar: (kombiner KOMMANDOar for Ã¥ spesifisera fleire val samstundes)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkomen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Gjeldande stÃ¸tta transport-TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, ven!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlege nÃ¸klar"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-posten vart laga med regnbogar, einhyrningar og gnistar\nfor %s pÃ¥ %s pÃ¥ %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +211,7 @@ msgid ""
 msgstr "BridgeDB kan forsyna bruer med fleire %sslags Pluggbare Transportar%s,\nnoko som kan hjelpa til med Ã¥ tildekkje koplingane dine Ã¥t Tor-nettverket, og\ngjera det vanskelegare for nokon som yvervakar internett-trafikken din Ã¥ avgjere\nat du nyttar Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -240,7 +223,7 @@ msgstr "Nokre broer med IPv6-adressor er Ã²g Ã¥tgjengelege, sjÃ¸lv um nokre Plug
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +232,169 @@ msgid ""
 "\n"
 msgstr "I tillegg hev BridgeDB mange vanlege bruer %s utan nokon Pluggbare\nTransportar %s, noko som kanskje ikkje hÃ¸yrast sÃ¥ kult ut, men dei kan framleis\nhjelpa med Ã¥ koma utanum internettsensur i mange dÃ¸me.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Kva er bruer?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bruer %s er Tor-relÃ© som hjelper deg med Ã¥ koma utanum sensur."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Eg treng ein alternativ mÃ¥te Ã¥ fÃ¥ bruer pÃ¥!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Eit anna vis Ã¥ fenge bruer pÃ¥ er Ã¥ sende ein e-post Ã¥t %s. Ver venleg og merk at du\nlyt sende e-posten ved hjelp av ei adressa frÃ¥ ein av dei fylgjande\ne-postÃ¥tbjodarane: %s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Brua mi verkar ikkje! Eg treng hjelp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Freist Ã¥ taka med so mange upplysingar um saka di som du kan, medrekna\nlista yver bruer og Pluggbare Transportar du freista Ã¥ nytta, Tor-nettlesarversjonen\ndin og alle meldinger som Tor gav ut, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Her er bru-linene dine:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "FÃ¥ bruer!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ver venleg og gjer val for brutype:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Treng du IPv6-adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Treng du %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Nettlesaren din viser ikkje bilete skikeleg."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn teikn frÃ¥ biletet nedanfor "
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Korleis starta Ã¥ bruka bruer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "For Ã¥ 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokkerer internett-tenesteÃ¥tbjodaren (ISP) din eller sensurerer han pÃ¥ anna vis\ntilkoplingar Ã¥t Tor-nettverket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vel 'Ja' og klikk deretter 'Neste'. For Ã¥ setja upp dei nye bruene dine, kopier og\nlim brulinene inn i tekstfeltet. Klikk Ã¥t slutt 'Kopla til', og du burde vere klÃ¥r! Um du\nupplever vanskar, freist Ã¥ klikka pÃ¥ 'Hjelp'-knappen i 'Tor-nettverksinnstillingar'-\nvegvisaren for meir hjelp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Viser denne meldinga."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Be om bruer med fabrikkoppsett."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Be om IPv6-bruer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Be um ein Pluggbar Transport ved hjelp av TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Feng ein kopi av BridgeDBs offentlege GnuPG-lykel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..92b5d4e
--- /dev/null
+++ b/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,402 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# A S Alam <alam.yellow@xxxxxxxxx>, 2014
+# Gursharnjit Singh <gursharnjitsingh13@xxxxxxxxx>, 2019-2020
+# KAMALJEET SINGH, 2018
+# SONIA SINGLA <soniasingla.1812@xxxxxxxxx>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à¨®à¨¾à¨«à¨¼ à¨?à¨°à¨¨à¨¾, à¨¤à©?à¨¹à¨¾à¨¡à©? à¨¬à©?à¨¨à¨¤à©? à¨µà¨¿à©±à¨? à¨?à©?à¨? à¨?à©?à¨¬à©? à¨¹à©?à¨?à¥¤"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "à¨¬à©±à¨? à¨¦à©? à¨°à¨¿à¨ªà©?à¨°à¨? à¨?à¨°à©?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "à¨¸à¨°à©?à¨¤ à¨?à©?à¨¡"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "à¨²à¨¾à¨? à¨¬à¨¦à¨²à©?"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à¨¸à¨¾à¨°à©? à¨?à©?à¨£à©?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR à¨?à©?à¨¡ à¨¦à¨¿à¨?à¨¾à¨?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR à¨?à©?à¨¡ à¨¤à©?à¨¹à¨¾à¨¡à©? à¨ªà©?à©±à¨² à¨²à¨¾à¨?à¨¨à©? à¨²à¨?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "à¨?à¨?à¨¿à¨¹à¨¾ à¨²à¨?à¨¦à¨¾ à¨¹à©? à¨?à¨¿ à¨¤à©?à¨¹à¨¾à¨¡à©? QRcode à¨¨à©?à©° à¨ªà©?à¨°à¨¾à¨ªà¨¤ à¨?à¨°à¨¨ à¨µà¨¿à©±à¨? à¨?à©±à¨? à¨¤à¨°à©?à©±à¨?à©? à¨¹à©?à¨? à¨¸à©?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à¨?à¨¸ QRCode à¨µà¨¿à©±à¨? à¨¤à©?à¨¹à¨¾à¨¡à©?à¨?à¨? à¨¬à©?à¨°à¨¿à¨? à¨²à¨¾à¨?à¨¨à¨¾à¨? à¨¸à¨¼à¨¾à¨®à¨¿à¨² à¨¹à¨¨ à¨?à¨ªà¨£à©? à¨ªà©?à©±à¨² à¨¸à¨¤à¨°à¨¾à¨? à¨¨à©?à©° à¨®à©?à¨¬à¨¾à¨?à¨² à¨?à¨¤à©? à¨¹à©?à¨° à¨¡à¨¿à¨µà¨¾à¨?à¨¸à¨¾à¨? à¨¤à©? à¨?à¨¾à¨ªà©? à¨?à¨°à¨¨ à¨²à¨? à¨?à¨¸ à¨¨à©?à©° QRCode à¨°à©?à¨¡à¨° à¨¨à¨¾à¨² à¨¸à¨?à©?à¨¨ à¨?à¨°à©?"
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "à¨?à¨¸ à¨µà©?à¨²à©? à¨?à©?à¨? à¨µà©? à¨ªà©?à¨² à¨?à¨ªà¨²à¨¬à©±à¨§ à¨¨à¨¹à©?à¨? à¨¹à©? ..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à¨¸à¨¼à¨¾à¨?à¨¦ à¨¤à©?à¨¹à¨¾à¨¨à©?à©° %s à¨µà¨¾à¨ªà¨¸ à¨?à¨¾ %s à¨?à©?à¨¸à¨¼à¨¿à¨¸à¨¼ à¨?à¨°à¨¨à©? à¨ªà¨µà©?à¨?à©? à¨?à¨¤à©? à¨?à©±à¨? à¨µà©±à¨?à¨°à©? à¨ªà©?à¨² à¨¦à©? à¨?à¨¿à¨¸à¨® à¨¦à©? à¨?à©?à¨£ à¨?à¨°à©?!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à¨?à¨¦à¨® %s 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à¨¡à¨¾à¨?à¨¨à¨²à©?à¨¡ %s à¨?à©?à¨° à¨¬à©?à¨°à¨¾à¨?à©?à¨° %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à¨?à¨¦à¨® %s 2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "à¨ªà©?à¨² %s à¨²à¨µà©? %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "à¨?à¨¦à¨® %s 3 %s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "à¨¨à¨¹à©?à¨?"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr ""
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "à¨ªà©?à¨² à¨?à©? à¨¹à¨¨?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "à¨?à¨¾à¨²à©?"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
index 50acee4..883dac6 100644
--- a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
@@ -1,132 +1,150 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2014
 # Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2013
 # JerBen <ayurveda63@xxxxxxxxx>, 2012
+# Bartosz Duszel <bartosz.duszel@xxxxxxxxxxxxxx>, 2020
 # bogdrozd <bog.d@xxxxxxxxx>, 2013
 # Dawid Job <hoek@xxxxxxx>, 2014
 # Rikson <Ers@xxxxxxxxxxxx>, 2014
 # Karol Obartuch <kobartuch@xxxxxxx>, 2015
+# Konrad Wila <360kon@xxxxxxxxx>, 2019
 # Krzysztof Å?ojowski <maxxxrally@xxxxxxxxx>, 2014
 # oirpos <kuba2707@xxxxxxxxx>, 2015
 # sebx, 2014-2015
+# Waldemar Stoczkowski, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "JÄ?zyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "ZgÅ?oÅ? BÅ?Ä?d"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kod ÅºrÃ³dÅ?owy"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Lista zmian"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PokaÅ¼ KodQR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KodQR dla Twoich linii bridge"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ups, coÅ? poszÅ?o nie tak!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "WyglÄ?da na to, Å¼e napotkaliÅ?my na bÅ?Ä?d podczas prÃ³by pobrania Twojego kodu QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodÃ³w QR, aby skopiowaÄ? je do Twojego telefonu lub innych urzÄ?dzeÅ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Aktualnie nie ma dostÄ?pnych Å¼adnych mostÃ³w..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Prawdpododobnie powinieneÅ? sprÃ³bowaÄ? %s wrÃ³ciÄ? %s i wybraÄ? inny typ mostu!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Pobierz %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Pobierz %s mostki %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s dodaj mosty do Tor Browser %s"
@@ -135,27 +153,27 @@ msgstr "Teraz %s dodaj mosty do Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sP%so prostu daj mi mosty!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opcje zaawansowane"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "brak"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sak!"
@@ -163,69 +181,37 @@ msgstr "%sT%sak!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sozyskaj mosty"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[To jest wiadomoÅ?Ä? generowana automatycznie; prosimy na niÄ? nie odpisywaÄ?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[To jest automatyczny e-mail.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Oto Twoje mostki:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Przekroczono limit szybkoÅ?ci. ProszÄ? zwolnij! Minimalny czas pomiÄ?dzy \nwiadomoÅ?ci e-mail to %s godzin. Wszystkie dodatkowe e-maile w tym okresie bÄ?dÄ? ignorowane."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "POLECENIA: (Å?Ä?cz polecenia, aby sprecyzowaÄ? kilka opcji jednoczeÅ?nie)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Witamy w BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Obecnie obsÅ?ugiwane transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Witaj, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Witaj przyjacielu!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Klucze Publiczne"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ten email zastaÅ? wygenerowany przez tÄ?cze, jednoroÅ¼ce i gwiazdki \ndla %s w %s o %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -236,7 +222,7 @@ msgid ""
 msgstr "BridgeDB moÅ¼e dostarczaÄ? poÅ?Ä?czenia mostkowe z kilkoma %stypes wÅ?Ä?czanymi protokoÅ?ami%s,\nktÃ³re mogÄ? pomÃ³c ukryÄ? Twoje poÅ?Ä?czenie do Sieci Tor, tworzÄ?c trudniejsze\ndo podsÅ?uchania dla osÃ³b obserwujÄ?cych ruch sieci w celu ustalenia gdzie siÄ? znajdujesz\nuÅ¼ywajÄ?c Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -248,7 +234,7 @@ msgstr "NiektÃ³re poÅ?Ä?czenia mostkowe z adresami IPv6 sÄ? rÃ³wnieÅ¼ dostÄ?pne,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -257,134 +243,169 @@ msgid ""
 "\n"
 msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostÃ³w %s bez \njakichkolwiek pluggable transports %s, ktÃ³re mogÄ? wydawaÄ? siÄ? niezbyt przydatne, \njednak w wielu przypadkach mogÄ? pomÃ³c w obejÅ?ciu cenzury.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Czym sÄ? mostki?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Mosty %s sÄ? wÄ?zÅ?ami w sieci Tor pomagajÄ?cymi w ominiÄ?ciu cenzury."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostkÃ³w!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Innym sposobem na pozyskanie mostu jest wysÅ?anie wiadomoÅ?ci e-mail na adres %s. ProszÄ? pamiÄ?taÄ?, Å¼e naleÅ¼y \nwysÅ?aÄ? wiadomoÅ?Ä? uÅ¼ywajÄ?c adresu jednego z nastÄ?pujÄ?cych dostawcÃ³w poczty elektronicznej:\n%s, %s lub %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "JeÅ?li TwÃ³j Tor nie dziaÅ?a, powinieneÅ? wysÅ?aÄ? wiadomoÅ?Ä? e-mail na adres %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "SprÃ³buj zawrzeÄ? jak najwiecej informacji o swoim problemie, uwzglÄ?dniajÄ?c listÄ? mostÃ³w i Pluggable Transports, ktÃ³rych prÃ³bowaÅ?eÅ? uÅ¼yÄ?, wersjÄ? Tor Browser, wszelkie komunikaty, ktÃ³re zwrÃ³ciÅ? Tor i inne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "JeÅ¼eli Twoja przeglÄ?darka Tor nie moÅ¼e siÄ? poÅ?Ä?czyÄ?, sprÃ³buj %s oraz %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Oto Twoje poÅ?Ä?czenia z wykorzystaniem mostÃ³w:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ZdobÄ?dÅº Mosty!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mechanizmy dystrybucji Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementuje cztery mechanizmy dystrybucji mostÃ³w: \"HTTPS\", \"Moat\",\n\"Email\" oraz \"Zarezerwowane\".  Mosty, ktÃ³re nie sÄ? dystrybuowane przez BridgeDB uÅ¼ywajÄ?\npseudo-mechanizm \"None\".  PoniÅ¼sza lista skrÃ³towo opisuje jak\ndziaÅ?ajÄ? te poszczegÃ³lne mechanizmy oraz nasze %s metryki BridgeDB %s pokazujÄ? jak popularny jest\ndany mechanizm."
+
+#: bridgedb/strings.py:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr "Zarezerwowane"
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Brak"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Czy potrzebujesz adresÃ³w IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Czy potrzebujesz %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazÃ³w prawidÅ?owo."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "WprowadÅº tekst z obrazka powyÅ¼ej..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Jak zaczÄ?Ä? uÅ¼ywaÄ? mostÃ³w"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Aby wprowadziÄ? mosty do Tor Browser, postÄ?puj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomiÄ? Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Czy TwÃ³j dostawca usÅ?ug internetowych (ISP) blokuje lub cenzuruje poÅ?Ä?czenia do sieci Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Wybierz 'Tak' a nastÄ?pnie kliknij 'Dalej'. Aby skonfigurowaÄ? swoje nowe \nmosty, skopiuj i wklej kaÅ¼dy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'PoÅ?Ä?cz' i to wszystko! JeÅ?li napotkasz jakiekolwiek problemy, naciÅ?nij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "WyÅ?wietla tÄ? wiadomoÅ?Ä?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PoproÅ? o regularne mosty."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PoproÅ? o mosty IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PoproÅ? o Pluggable Transport przez TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Uzyskaj kopiÄ? klucza publicznego GnuPG BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
index 1ef7385..b4ac03c 100644
--- a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,140 +1,158 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
-# Communia <ameaneantie@xxxxxxxxxx>, 2013-2017
+# Communia <ameaneantie@xxxxxxxxxx>, 2013-2017,2020
 # AndrÃ© Almeida <andrefalmeida@xxxxxxxxxxxxxx>, 2018
 # anominino anomino <anominino@xxxxxxxxxx>, 2018
+# C. E., 2020
 # ClÃ¡udio Carvalho <znnb@xxxxxxxx>, 2018
 # Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>, 2019
 # Danton Medrado, 2015
+# Eduardo Addad de Oliveira <eduardoaddad@xxxxxxxxxxx>, 2019-2020
 # Eduardo Bonsi, 2015,2018
 # Eduardo Loeffel Noce Gobi <eduardogobi@xxxxxxxxxxx>, 2016-2017
 # Augustine <evandro@xxxxxxxxxxxxx>, 2013
 # Humberto Sartini, 2014
+# Igor Bk 13 <igorgcoleto@xxxxxxxxx>, 2020
 # Isabel Ferreira, 2014
 # jhqpinto <jhqpinto@xxxxxxxxxxx>, 2018
 # JoÃ£o Paulo S.S <contato1908@xxxxxxxxx>, 2015
 # Kaio Soares Rauta <kaio_soares_rauta@xxxxxxxxxxxx>, 2015
 # Luciana Dark Blue <lucianadarkblue@xxxxxxxxx>, 2015
+# m tk, 2019
 # m4lqu1570 <>, 2012
 # Rodrigo Emmanuel Santana Borges <rodrigoesborges@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-02 18:18+0000\n"
-"Last-Translator: Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 14:42+0000\n"
+"Last-Translator: Igor Bk 13 <igorgcoleto@xxxxxxxxx>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Algo errado ocorreu com a sua solicitaÃ§Ã£o."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Relatar um Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo Fonte:"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Registro de alteraÃ§Ãµes"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contato"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as suas pontes de conexÃ£o"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ai, caramba!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que houve um erro ao obter o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©m as suas pontes de conexÃ£o. Escaneie com um leitor de CÃ³digo QR para copiar as pontes de conexÃ£o para dispositivos mÃ³veis e outros aparelhos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB encontrou um erro."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente nÃ£o hÃ¡ nenhuma ponte disponÃvel..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Talvez vocÃª deva tentar %s voltar %s e escolher um outro tipo de ponte!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Fazer download do %s Navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
@@ -143,27 +161,27 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%spenas me dÃª pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -171,69 +189,37 @@ msgstr "%sS%sim!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sObter%s Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta Ã© uma mensagem automÃ¡tica; por favor, nÃ£o responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este Ã© um email automÃ¡tico.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Aqui estÃ£o suas pontes:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "VocÃª excedeu o quantidade limite. Mais devagar, por favor! O tempo mÃnimo entre\ne-mails Ã© de %s horas. Todos os outros e-mails serÃ£o ignorados durante este perÃodo."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combine COMANDOS para especificar mÃºltiplas opÃ§Ãµes simultaneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bem vindo ao BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOS de transporte compatÃveis no momento:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "OlÃ¡, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "OlÃ¡, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chaves PÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este e-mail foi gerado com arco-Ãris, unicÃ³rnios e brilho, para  %s, em %s, Ã s %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se essas pontes nÃ£o sÃ£o o que vocÃª precisa, responda para este email com um dos\nseguintes comandos no corpo da mensagem:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -244,7 +230,7 @@ msgid ""
 msgstr "BridgeDB pode fornecer pontes com vÃ¡rios %stipos de Transportadores PlugÃ¡veis%s,\nque podem ajudar a ocultar as suas conexÃµes com a rede Tor, tornando mais difÃcil,\npara quem estiver observando o seu trÃ¡fego na Internet, saber ao certo se vocÃª estÃ¡ usando Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -256,7 +242,7 @@ msgstr "Algumas pontes com endereÃ§os IPv6 tambÃ©m estÃ£o disponÃveis, embora a
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -265,134 +251,169 @@ msgid ""
 "\n"
 msgstr "AlÃ©m disso, BridgeDB tem vÃ¡rias pontes simples %s sem quaisquer Transportadores PlugÃ¡veis %s, o que talvez nÃ£o pareÃ§a tÃ£o legal, mas pode ajudar a driblar a censura na Internet em muitos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Pontes %s sÃ£o relÃ©s Tor que ajudam a driblar a censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Preciso de um outro modo de obter pontes!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lembre que vocÃª deve enviar o e-mail utilizando um endereÃ§o registrado em um dos seguintes provedores de e-mail: \n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Outra maneira de obter pontes Ã© enviar um email para %s. Deixe o assunto do email\nesvazie e escreva \"get transport obfs4\" no corpo da mensagem do email. Observe\nque vocÃª deve enviar o email usando um endereÃ§o de um dos seguintes emails\nprovedores: %s ou %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Minhas pontes nÃ£o funcionam!  Preciso de ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o Tor nÃ£o funcionar, envie um e-mail %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ãµes possÃveis sobre o seu caso, junto com a lista de \npontes e Transportadores PlugÃ¡veis que vocÃª tentou utilizar, a versÃ£o do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se o seu navegador Tor nÃ£o se conectar, consulte %se %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas pontes de conexÃ£o:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Obtenha Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuiÃ§Ã£o de pontes"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementa quatro mecanismos para distribuir pontes: \"HTTPS\", \"Moat\", \"Email\", \"Reservado\". Pontes que nÃ£o sÃ£o distribuÃdas por BridgeDB usam o pseudomecanismo \"Nenhum\". A lista seguinte explica resumidamente como estes mecanismos funcionam e o nosso %s mÃ©tricas BridgeDB %s visualize quÃ£o popular Ã© cada um dos mecanismos."
+
+#: bridgedb/strings.py:115
+#, 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 "O mecanismo de distribuiÃ§Ã£o \"HTTPS\" distribui pontes sobre este site. Para obter pontes, vÃ¡ para %s bridges.torproject.org%s, selecione suas opÃ§Ãµes preferidas e resolva o CAPTCHA subsequente."
+
+#: bridgedb/strings.py:119
+#, 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 "O mecanismo de distribuiÃ§Ã£o \"Moat\" Ã© parte do Navegador Tor, permitindo usuÃ¡rios requisitarem pontes de dentro das configuraÃ§Ãµes do Navegador Tor deles. Para obter pontes, vÃ¡ para as %s configuaraÃ§Ãµes Tor%s do seu Navegador Tor, clique em \"requisitar uma nova ponte\", resolva o CAPTCHA subsequente e o Navegador Tor irÃ¡ automaticamente adicionar suas novas pontes."
+
+#: bridgedb/strings.py:125
+#, 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 "UsuÃ¡rios podem requisitar pontes atravÃ©s do mecanismo de distribuiÃ§Ã£o \"Email\" ao enviar um email para %s bridges@xxxxxxxxxxxxxx%s e escrevendo \"get transport obfs4\" no corpo do email."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, 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 mantÃ©m um pequeno nÃºmero de pontes que nÃ£o sÃ£o distribuÃdas automaticamente. Ao invÃ©s, nÃ³s reservamos estas pontes para distribuiÃ§Ã£o manual e as distribuÃmos para ONGs e outras organizaÃ§Ãµes individuais que necessitam de pontes. Pontes que sÃ£o distribuÃdas atravÃ©s do mecanismo \"Reservado\" podem nÃ£o ser usadas com tanta frequÃªncia. Observe que o mecanismo de distribuiÃ§Ã£o \"Reservado\" Ã© chamado de \"NÃ£o alocado\" nos arquivos %sbridge pool assignment%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:138
+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 "Pontes as quais o mecanismo de distribuiÃ§Ã£o Ã© \"Nenhum\" nÃ£o sÃ£o distribuÃdas por BridgeDB.\nÃ? responsabilidade do operador da ponte distribuir suas pontes para os \n\nusuÃ¡rios. Observe que, na Pesquisa de retransmissÃ£o, a distribuiÃ§Ã£o de uma ponte recÃ©m-configurada\nmecanismo diz \"Nenhum\" por atÃ© aproximadamente um dia. Por favor, seja paciente e\nele mudarÃ¡ para o mecanismo de distribuiÃ§Ã£o atual da ponte.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes de tipos de pontes:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "VocÃª precisa de endereÃ§os IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "VocÃª precisa de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Seu navegador nÃ£o estÃ¡ mostrando as imagens corretamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Digite os caracteres da imagem acima..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Como comeÃ§ar a usar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Primeiro vocÃª precisa %sbaixar o Navegador Tor%s. Nosso manual do usuÃ¡rio\n do Navegador Tor explica como vocÃª pode adicionar pontes para o Navegador Tor. Se vocÃª estiver\n usando Windows, Linux ou macOS, %sclique aqui%s para aprender mais. Se vocÃª\n estiver usando Android, %sclique aqui%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Adicione estas pontes para o seu Navegador Tor abrindo o as preferÃªncias do \nseu navegador, clicando em \"Tor\" e entÃ£o adicionando elas no campo \n\"ForneÃ§a uma ponte\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "O seu Provedor de ServiÃ§os de Internet (PSI) bloqueia ou censura conexÃµes\nÃ  rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar pontes nÃ£o ofuscadas do Tor "
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e clique em 'PrÃ³ximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexÃ£o na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverÃ¡ estar pronto! Caso haja problemas, clique no botÃ£o 'Ajuda' do assistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais suporte."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostrar essa mensagem."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicitar pontes simples."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar pontes IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar um Transportador PlugÃ¡vel por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicitar pontes IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG do BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicitar pontes obfs4 ofuscadas.)"
diff --git a/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
index e42ec77..b760cc5 100644
--- a/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
@@ -1,10 +1,11 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A Russo <quisquiliarum2001-habitica@xxxxxxxxxxx>, 2019
+# Hugo9191 <hugoncosta@xxxxxxxxx>, 2019-2020
+# Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019-2020
 # Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2018
 # Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019
 # Nuno Rego <nuno.rego@xxxxxxxxxxx>, 2019
@@ -13,116 +14,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-11 10:53+0000\n"
-"Last-Translator: Nuno Rego <nuno.rego@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Comunicar um Erro"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
-msgstr "Registo de alteraÃ§Ãµes"
+msgstr "Registo de AlteraÃ§Ãµes"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contactar"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as suas linhas de ponte"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ocorreu um erro!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que ocorreu um erro ao obter o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©m as suas linhas de ponte. Digitalize-as com um leitor de CÃ³digo QR para copiar as suas linhas de ponte para os dispositivos mÃ³veis e outros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente, nÃ£o existem pontes disponÃveis..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Talvez devesse experimentar %s e voltar a %s,  escolhendo um tipo de ligaÃ§Ã£o diferente!"
+msgstr "Talvez deva tentar %s e voltar a %s e escolher um tipo de ponte diferente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Transferir %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
@@ -131,27 +147,27 @@ msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sisponibilizem-me apenas as pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -159,69 +175,37 @@ msgstr "%sS%sim!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta Ã© uma mensagem automÃ¡tica; por favor, nÃ£o responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Esta Ã© uma mensagem automÃ¡tica.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Aqui estÃ£o as suas pontes:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mÃnimo entre e-mails \nÃ© de %s horas. Todos os e-mails enviados nesse  perÃodo serÃ£o ignorados."
+msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mÃnimo entre e-mails Ã© \nde %s horas. Todos os e-mails enviados nesse perÃodo serÃ£o ignorados."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combine COMANDOS para especificar mÃºltiplas opÃ§Ãµes em simultÃ¢neo)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bem-vindo ao BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOS de transporte atualmente suportados:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "OlÃ¡, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "OlÃ¡, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chaves PÃºblicas"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Esta mensagem foi gerada com arco-Ãris, unicÃ³rnios e estrelas\npara %s em %s Ã s %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se estas pontes nÃ£o sÃ£o o que necessita, responda a este email com um dos\nseguintes comandos no corpo da mensagem:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,158 +213,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "O BridgeDB pode disponibilizar ligaÃ§Ãµes com vÃ¡rios %stipos de ConexÃµes%s,\nque podem ajudar a ocultar as suas ligaÃ§Ãµes Ã  Rede Tor, tornando mais difÃcil\npara alguÃ©m monitorizar o seu trÃ¡fego na Internet para determinar se estÃ¡ a utilizar o Tor.\n"
+msgstr "BridgeDB pode disponibilizar pontes com vÃ¡rios %stipos de 'Transportes LigÃ¡veis'%s,\nque podem ajudar a ocultar as suas ligaÃ§Ãµes Ã  Rede Tor, tornando mais difÃcil\npara alguÃ©m monitorizar o seu trÃ¡fego na Internet para determinar se estÃ¡ a utilizar o Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "TambÃ©m estÃ£o disponÃveis algumas ligaÃ§Ãµes com endereÃ§os de IPv6, embora\nalgumas conexÃµes nÃ£o sejam compatÃveis com IPv6.\n\n"
+msgstr "TambÃ©m estÃ£o disponÃveis algumas pontes com endereÃ§os de IPv6, embora\nalguns 'Transportes LigÃ¡veis' nÃ£o sÃ£o compatÃveis com IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Adicionalmente, BridgeDB tem imensas ligaÃ§Ãµes %s simples, normais e regulares,\nsem quaisquer Transportes de LigaÃ§Ã£o %s, o que poderÃ¡ nÃ£o parecer Ã³timo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
+msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer 'Transportes LigÃ¡veis' %s que poderÃ¡ nÃ£o parecer Ã³timo, mas estes,\nainda assim, ajudam a contornar a censura da Internet na maioria dos casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "As %s Pontes %s sÃ£o retransmissÃµes Tor que o ajudam a contornar a censura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Eu preciso de um modo alternativo para obter as pontes!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outra forma de obter pontes, Ã© enviar uma mensagem para %s. Por favor, note que\ndeve enviar a mensagem utilizando um endereÃ§o dos seguintes fornecedores de e-mail\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Outra forma de obter pontes, Ã© enviar um ''e-mail'' para %s. Deixe o assunto da mensagem\nem branco e escreva \"get transport obfs4\" no corpo da mesma. Por favor, note que deve enviar  \na mensagem utilizando um endereÃ§o dos seguintes provedores de ''e-mail'':\n%s ou %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "As minhas pontes nÃ£o funcionam! Eu preciso de ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor nÃ£o funciona, deve enviar uma mensagem para %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ã£o possÃvel sobre o seu caso, incluindo a lista\nde ligaÃ§Ãµes e Pluggable Transports que tentou utilizar, a versÃ£o do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se o seu Tor Browser nÃ£o consegue ligar, por favor, consulte %s e o nosso %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas linhas de ponte:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuiÃ§Ã£o de Ponte"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 "A BridgeDB implementa 4 mecanismos para distribuir pontes: \"HTTPS\", \"Moat\",\n\"Email\" e \"Reserved\". As pontes que nÃ£o sÃ£o distribuÃdas atravÃ©s do BridgeDB usam\no pseudo-mecanismo \"None\".  A seguinte lista explica rapidamente como Ã© que estes\nmechanisms funcionam e as nossas %smÃ©tricas BridgeDB%s visualizam quÃ£o popular cada um dos\nmecanismos Ã©."
+
+#: bridgedb/strings.py:115
+#, 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 "O mecanismo de distribuiÃ§Ã£o \"HTTPS\" distribui pontes atravÃ©s deste website. Para obter\npontes, vÃ¡ a %sbridges.torproject.org%s, seleciona as opÃ§Ãµes e\nresolva o CAPTCHA subsequente."
+
+#: bridgedb/strings.py:119
+#, 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 "O mecanismo de distribuiÃ§Ã£o \"Moat\" Ã© parte do Tor Browser, permitindo aos utilizadores\npedir pontes atravÃ©s das definiÃ§Ãµes do Tor Browser. Para obter pontes, vÃ¡ Ã s\n%sTor settings%s do seu Tor Browser, clique em \"pedir uma nova ponte\", resolva o CAPTCHA subsequente e o Tor Browser automaticamente adicionarÃ¡ as suas novas\npontes."
+
+#: bridgedb/strings.py:125
+#, 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 "Utilizadores podem pedir pontes atravÃ©s do mecanismo de distribuiÃ§Ã£o \"Email\" enviando um\nemail para %sbridges@xxxxxxxxxxxxxx%s e escrevendo \"get transport obfs4\" no\ncorpo do email."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, 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 "A BridgeDB mantem um pequeno nÃºmero de pontes que nÃ£o sÃ£o distribuÃdas\nautomaticamente. Em vez disso, reservamos essas pontas para distribuiÃ§Ã£o manual e\nenviamos a ONGs e outras organizaÃ§Ãµes ou indivÃduos que precisem de\npontes. As pontes distribuÃdas atravÃ©s do mecanismo \"Reserved\" podem nÃ£o\nver utilizadores por muito tempo. Note que o mecanismo de distribuiÃ§Ã£o \"Reserved\" Ã©\nchamado de \"Unallocated\" nos ficheiros de %sassignaÃ§Ã£o de pontes%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:138
+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 "Pontes cujo mecanismo de distribuiÃ§Ã£o seja \"None\" nÃ£o sÃ£o distribuÃdas pelo BridgeDB.\nÃ? a responsabilidade do operador da ponte distribuir as suas pontes aos\nutilizadores. Note que em Relay Search, o mecanismo de distribuiÃ§Ã£o de uma ponte \ndiz \"None\" por aproximadamente um dia. Tenha um pouco de paciÃªncia e\nirÃ¡ mudar para o correto mecanismo de distribuiÃ§Ã£o da ponte.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes para o tipo de ponte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Precisa de endereÃ§os de IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Precisa de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador nÃ£o estÃ¡ a exibir as imagens devidamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Insira os carateres da imagem acima..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Como comeÃ§ar a utilizar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Para inserir as ligaÃ§Ãµes no Tor Browser, aceda primeiro Ã  pÃ¡gina %s para transferir o Tor Browser %s\ne depois siga as instruÃ§Ãµes sobre com transferir e utilizar o\nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Primeiro, tem de %sdescarregar o Tor Browser%s. O nosso Manual do Utilizador \n do Tor Browser explica como pode adicionar pontes ao Tor Browser. Se estiver a utilizar\n Windows, Linux ou OS X, %sclique aqui%s para aprender mais. Se estiver\n a usar Android, %sclique aqui%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Assim que aparecer a janela de 'ConfiguraÃ§Ãµes da Rede Tor' clique em 'Configurar' e siga\nas instruÃ§Ãµes do assistente atÃ© que lhe pergunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Adicione estas pontes ao seu Tor Browser abrindo as preferÃªncias do \nseu navegador, clicando em \"Tor\" e daÃ adicionÃ¡-las ao campo \"Providenciar uma\nponte\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "O seu fornecedor de acesso Ã  Internet (ISP) bloqueia ou censura as ligaÃ§Ãµes\nÃ  rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar pontes Tor nÃ£o ofuscadas.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas conexÃµes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeverÃ¡ estar pronto para continuar! Se encontrar problemas, tente clicar na 'Ajuda' no\nassistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais assistÃªncia."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Exibe esta mensagem."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicite as pontes bÃ¡sicas."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicite as pontes de IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicite um Transporte de LigaÃ§Ã£o por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Pedir pontes IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtenha uma cÃ³pia da chave pÃºblica GnuPG da BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Pedir pontes obfs4 ofuscadas.)"
diff --git a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
index 599051c..6cbc42f 100644
--- a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # A C <ana@xxxxxxxxxxxx>, 2019
@@ -9,123 +9,140 @@
 # Ana <ana_maria_js@xxxxxxxxx>, 2015
 # axel_89, 2015
 # Di N., 2015
+# eduard pintilie <eduard.pintilie@xxxxxxxxx>, 2019-2020
 # Isus Satanescu <inactive+isus@xxxxxxxxxxxxx>, 2014
 # laura berindei <lauraagavriloae@xxxxxxxxx>, 2014
+# polearnik <polearnik@xxxxxxx>, 2019
 # clopotel <yo_sergiu05@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-08 20:34+0000\n"
-"Last-Translator: A C <ana@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Scuze ! Ceva n-a mers cum trebuie!"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "LimbÄ?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "RaporteazÄ? un bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Cod sursÄ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "SchimbÄ?ri"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selectare totalÄ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "AratÄ? QRcod-ul"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Cod QR pentru punÈ?ile tale"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Oops, ca sÄ? vezi!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Se pare cÄ? s-a produs o eroare Ã®n obÈ?inerea codului QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Codul QR conÈ?ine punÈ?ile tale. ScaneazÄ?-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Pe moment nu existÄ? punÈ?i disponibile..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Poate ar trebui sÄ? %s mergi Ã®napoi %s È?i sÄ? alegi un alt tip de punte!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Pasul %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "DescarcÄ? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Pasul %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ObÈ?ine %s punÈ?i %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pasul %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
@@ -134,27 +151,27 @@ msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÈ?iuni avansate"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nu"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niciunul/niciuna"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -162,69 +179,37 @@ msgstr "%sD%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbÈ?ine Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Acesta este un mesaj automat; te rugÄ?m sÄ? nu rÄ?spunzi.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Acesta este un e-mail trimis automat.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Acestea sunt punÈ?ile tale:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ai depÄ?È?it rata limitÄ?. Te rugÄ?m sÄ? o iei mai Ã®ncet! Timpul minim Ã®ntre\ne-mail-uri este %s ore. Toate e-mail-urile Ã®n acest interval vor fi ignorate."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combinÄ? COMMANDs pentru a specifica mai multe opÈ?iuni simultan)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bine ai venit la BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPE-uri suportate momentan:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "BunÄ? , %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "BunÄ?, prietene!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chei publice"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Acest e-mail a fost generat cu inorogi, curcubee È?i scÃ¢ntei \npentru %s Ã®n %s la %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "DacÄ? aceste punÈ?i nu sunt cele necesare, rÄ?spundeÈ?i la acest e-mail cu una dintre\nurmÄ?toarele comenzi Ã®n corpul mesajului:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +220,7 @@ msgid ""
 msgstr "BridgeDB poate oferi punÈ?i cu diferite tipuri de %sPluggable Transports %s,\nce pot ascunde conexiunile tale cÄ?tre Tor Network, fÄ?cÃ¢nd mai dificil \nde observat cÄ? foloseÈ?ti Tor\npentru cine Ã®È?i urmÄ?reÈ?te traficul de Internet.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -247,7 +232,7 @@ msgstr "Unele punÈ?i cu adrese IPv6 sunt disponibile, deÈ?i unele Pluggable\nTra
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +241,169 @@ msgid ""
 "\n"
 msgstr "Ã?n plus, BridgeDB are multe punÈ?i simple %s fÄ?rÄ? niciun\nTransport Conectabil %s ce poate nu par aÈ?a cool, dar care pot\ntotuÈ?i sÄ? ajute la evitarea cenzurii Internetului Ã®n multe cazuri.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ce sunt punÈ?ile? "
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s PunÈ?ile %s sunt releuri Tor care te ajutÄ? sÄ? eviÈ?i cenzura."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "O altÄ? cale pentru a obÈ?ine punÈ?i este sÄ? trimiÈ?i un email cÄ?tre %s. Nu uita cÄ?\ntrebuie sa trimiÈ?i email-ul folosind o adresÄ? de la unul dintre urmÄ?torii furnizori de e-mail:\n%s, %s sau %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Un alt mod de a obÈ?ine punÈ?i este sÄ? trimiteÈ?i un e-mail cÄ?tre %s. LÄ?saÈ?i subiectul de e-mail\ngol È?i scrieÈ?i  \"get transport obfs4\" Ã®n corpul de e-mail. VÄ? rugÄ?m sÄ? reÈ?ineÈ?i\ncÄ? trebuie sÄ? trimiteÈ?i e-mailul utilizÃ¢nd o adresÄ? de la unul dintre furnizorii de e-mail: %s sau %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "PunÈ?ile mele nu funcÈ?ioneazÄ?! Am nevoie de ajutor!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "DacÄ? Tor nu funcÅ£ioneazÄ? pentru tine, trimite un mesaj la  %s ."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ã?ncercÄ? sÄ? incluzi cÃ¢t mai multe informaÈ?ii despre cazul tÄ?u pe cÃ¢t posibil, include lista de \npunÈ?i È?i Pluggable Transports pe care ai Ã®ncercat sÄ? le foloseÅ?ti, versiunea de navigator Tor Browser\nÈ?i orice alt mesaj dat de Tor, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "DacÄ? Tor Browser nu se poate conecta, vÄ? rugÄ?m sÄ? aruncaÈ?i o privire la %s È?i %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Acestea sunt liniile tale de punÈ?i:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ObÈ?ine punÈ?i!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanisme de distribuÈ?ie a punÈ?ii"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementeazÄ? patru mecanisme de distribuire a punÈ?ilor: \"HTTPS\", \"Moat\",\n\"Email\" È?i \"Reserved\".  PunÈ?ile care nu sunt distribuite prin BridgeDB folosesc\npseudo-mecanismul \"None\".  UrmÄ?toarea listÄ? explicÄ? pe scurt cum  funcÈ?ioneazÄ? acestea\nÈ?i cum se poate vizualiza cu %sBridgeDB metrics%s cÃ¢t de popular este fiecare \nmecanism."
+
+#: bridgedb/strings.py:115
+#, 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 "Mecanismul de distribuÈ?ie â??HTTPSâ?? transmite punÈ?i peste acest site web.  Pentru a obÈ?ine\npunÈ?i, accesaÈ?i %sbridges.torproject.org%s, selectaÈ?i opÈ?iunile pe care le preferaÈ?i È?i\nrezolvaÈ?i testul CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, 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 "Mecanismul de distribuire \"Moat\" face parte din Tor Browser, permiÈ?Ã¢nd utilizatorilor sÄ?\nsolicite punÈ?i din setÄ?rile Tor Browser.  Pentru a obÈ?ine punÈ?i, accesaÈ?i\nsetÄ?rile Tor Browser %sTor settings%s, clic pe \"request a new bridge\", rezolvaÈ?i\ntestul CAPTCHA È?i Tor Browser va adÄ?uga automat noile\npunÈ?i."
+
+#: bridgedb/strings.py:125
+#, 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 "Utilizatorii pot solicita punÈ?i de la mecanismul de distribuÈ?ie â??Emailâ?? prin trimiterea unui\nemail la %sbridges@xxxxxxxxxxxxxx%s È?i scriind \"get transport obfs4\" Ã®n\ncorpul email-ului."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Rezervat"
+
+#: bridgedb/strings.py:130
+#, 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 menÈ?ine un numÄ?r mic de punÈ?i care nu sunt distribuite\nautomat.  Ã?n schimb, rezervÄ?m aceste punÈ?i pentru distribuirea manualÄ? È?i\nle Ã®nmÃ¢nÄ?m unor ONG-uri È?i unor organizaÈ?ii È?i persoane fizice care au nevoie\nde punÈ?i.  PunÈ?ile care sunt distribuite prin mecanismul \"Reserved\" ar putea sÄ? nu \nvadÄ? utilizatorii pe o perioadÄ? mai mare de timp.  ReÈ?ineÈ?i cÄ? mecanismul de distribuire \"Reserved\" este\nnumit \"Unallocated\" Ã®n fiÈ?ierele %sbridge pool assignment%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nimic"
+
+#: bridgedb/strings.py:138
+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 "PunÈ?ile al cÄ?ror mecanism de distribuÈ?ie este â??Noneâ?? nu sunt distribuite de BridgeDB.\nEste responsabilitatea operatorului de punÈ?i sÄ? distribuie punÈ?ile lor cÄ?tre\nutilizatori. ReÈ?ineÈ?i cÄ? la cÄ?utarea cu releu, distribuÈ?ia unei punÈ?i proaspÄ?t configurate\nmecanismul rÄ?spunde cu \"None\" timp de aproximativ o zi.  AveÈ?i rÄ?bdare, pentru cÄ?\nse va schimba apoi la mecanismul de distribuÈ?ie propriu-zis al punÈ?ii.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "Alege opÈ?iunile pentru tipul de punte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ai nevoie de adrese IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ai nevoie de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Introdu caracterele din imaginea de mai sus..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Cum sÄ? Ã®ncepi sÄ? foloseÅ?ti punÈ?ile"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Pentru a introduce punÈ?i Ã®n 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Mai Ã®ntÃ¢i, trebuie sÄ?  %sdescÄ?rcaÈ?i Tor Browser%s. Manualul Tor Browser User\nexplicÄ? cum puteÈ?i adÄ?uga punÈ?i la Tor Browser. DacÄ?\n folosiÈ?i Windows, Linux sau OS X, %sclic aici%s pentru a afla mai multe. DacÄ?\n folosiÈ?i Android, %sclic aici%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "AdÄ?ugaÈ?i aceste punÈ?i la Tor Browser deschizÃ¢nd \npreferinÈ?ele pentru browserul, faceÈ?i clic pe â??Torâ??, apoi adÄ?ugaÈ?i-le la cÃ¢mpul â??Provide a\nbridge\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Furnizorul de servicii de Internet (ISP) Ã®È?i blocheazÄ? sau cenzureazÄ? conexiunile cÄ?tre reÈ?eaua Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(SolicitÄ? punÈ?i Tor nedisimulate - unobfuscated.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "SelecteazÄ? 'Da' È?i apoi alege 'UrmÄ?torul'. Pentru a configura noile punÈ?i, copiazÄ? È?i lipeÈ?te \npunÈ?ile Ã®n cÄ?suÈ?a de text. Ã?n final, selecteazÄ? 'ConecteazÄ?-te' È?i totul e gata! \nDacÄ? ai probleme, apasÄ? butonul 'Ajutor' din 'SetÄ?ri ReÈ?ea Tor'."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "AfiÈ?eazÄ? acest mesaj."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Cere punÈ?i simple."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Cere punÈ?i IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "SolicitÄ? un Transport Conectabil dupÄ? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Cere punÈ?i IPv6.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "ObÈ?ine o copie a cheii GnuPG publice a BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Cere punÈ?i obfuscate obfs4.)"
diff --git a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
index f1b1475..ca5d2a9 100644
--- a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
@@ -1,12 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Andrey, 2017
 # Andrey Yoker Ogurchikov <domovoy.yoker@xxxxxxxxx>, 2014
 # Ð?Ð½Ñ?Ð¾Ð½ Ð¢Ð¾Ð»Ð¼Ð°Ñ?ÐµÐ² <a.tolmachev@xxxxxxxxxxxxxxxxxx>, 2016
 # Denis Denis <stereodenis@xxxxxxxxx>, 2014
+# diana azaryan <dianazryn@xxxxxxxxx>, 2020
 # Dmitry Schneider <adamred280@xxxxxxx>, 2019
 # Eugene, 2013
 # foo <im-infamous@xxxxxxxxx>, 2014
@@ -19,155 +20,172 @@
 # Oleg, 2014
 # Roberto Brigante, 2017
 # Sergey Briskin, 2014
-# Timofey Lisunov <solokot@xxxxxxxxx>, 2018
+# Sergey Smirnov <cj75300@xxxxxxxxx>, 2019-2020
+# solokot <solokot@xxxxxxxxx>, 2019
+# solokot <solokot@xxxxxxxxx>, 2018
 # Valid Olov, 2014
 # vb[fbk <kisn23@xxxxxxx>, 2015
 # Ð?Ð¸ÐºÑ?Ð¾Ñ? Ð?Ñ?Ñ?Ñ?Ð¸Ð½ <rewanh59@xxxxxxxxx>, 2016
 # Vitaliy Grishenko, 2014
-# Uho Lot <yavinav@xxxxxxxxx>, 2016
+# Andrey Kostrikov <yavinav@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-01 09:18+0000\n"
-"Last-Translator: Dmitry Schneider <adamred280@xxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð§Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ñ? Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð¯Ð·Ñ?Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ð½Ð°Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð²Ñ?Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "ÐÑ?, Ñ?Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?Ð¾Ð²"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ð¿Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ QR-ÐºÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð². Ð?Ñ?Ñ?ÐºÐ°Ð½Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐµÐ³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð¾Ð¼, Ñ?Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸Ð¼ QR-ÐºÐ¾Ð´, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð² Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ðµ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
+msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð². Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?Ðµ Ñ?ÐºÐ°Ð½ÐµÑ? QR-ÐºÐ¾Ð´Ð°, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ðµ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Ð?Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð¸Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ð¾Ð²Ð°Ñ?Ñ? %s Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?%s Ð¸ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ð°!"
+msgstr "Ð?Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð¸Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ð¾Ð²Ð°Ñ?Ñ? %s Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ? %s Ð¸ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
-msgstr "Ð¨Ð°Ð³ %sâ??1%s"
+msgstr "Ð¨Ð°Ð³ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð¹Ñ?Ðµ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
-msgstr "Ð¨Ð°Ð³ %sâ??2%s"
+msgstr "Ð¨Ð°Ð³ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ñ? %s"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° %s Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
-msgstr "Ð¨Ð°Ð³ %sâ??3%s"
+msgstr "Ð¨Ð°Ð³ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð?Ð°Ñ?ÐµÐ¼ %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser %s"
+msgstr "Ð¢ÐµÐ¿ÐµÑ?Ñ? %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
+msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?ÐµÑ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! "
@@ -175,69 +193,37 @@ msgstr "%sÐ?%sÐ°! "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sÐ?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²%s"
+msgstr "%sÐ?%sÐ¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ÐÑ?Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¾Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð½Ðµ Ð¾Ñ?Ð²ÐµÑ?Ð°Ð¹Ñ?Ðµ Ð½Ð° Ð½ÐµÐ³Ð¾.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[ÐÑ?Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¾Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ñ? Ð¿Ñ?ÐµÐ²Ñ?Ñ?Ð¸Ð»Ð¸ Ð´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¿Ð¾Ð·Ð¶Ðµ!\nÐ?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?ÐµÑ?ÐµÐ· %s Ñ?Ð°Ñ?Ð¾Ð². Ð¡Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?, Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ð´Ð¾ Ñ?Ñ?Ð¾Ð³Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¸, Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ñ?Ð¾Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ñ?."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð«: (Ñ?Ð¾Ð²Ð¼ÐµÑ?Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ?, Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¾ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¹ Ð¾Ð´Ð½Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ? Ð² BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð¢ÐµÐºÑ?Ñ?Ð¸Ð¹ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸  - TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ÐÐ¹, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹, Ð´Ñ?Ñ?Ð³!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "ÐÑ?Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð±Ñ?Ð»Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð³Ð¸, ÐµÐ´Ð¸Ð½Ð¾Ñ?Ð¾Ð³Ð¾Ð² Ð¸ Ñ?ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¸Ñ?Ð½Ð¸Ñ?\nÐ´Ð»Ñ? %s Ð² %s, Ð² %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ð?Ñ?Ð»Ð¸ Ñ?Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ðµ Ñ?Ð¾, Ñ?Ñ?Ð¾ Ð²Ð°Ð¼ Ð½Ñ?Ð¶Ð½Ð¾, Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ðµ Ð½Ð° Ñ?Ñ?Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾\nÑ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? Ð¾Ð´Ð½Ð¾Ð¹ Ð¸Ð· Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ð¸Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð² Ñ?ÐµÐ»Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,158 +231,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ %s Ñ?Ð¸Ð¿Ð°Ð¼Ð¸ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?%s,\nÑ?Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ? Ñ?Ð½Ð¸Ð·Ð¸Ñ?Ñ? Ñ?Ð¸Ñ?Ðº Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? Ð¸ Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ? Tor Network. Ð?Ð»Ð°Ð³Ð¾Ð´Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ð¼Ñ? Ð²Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð² Ñ?ÐµÑ?Ð¸ Tor Ð¾Ñ?Ñ?Ð»ÐµÐ´Ð¸Ñ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.\n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ %s Ñ?Ð¸Ð¿Ð°Ð¼Ð¸ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð¾Ð²%s,\nÑ?Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ? Ñ?Ð½Ð¸Ð·Ð¸Ñ?Ñ? Ñ?Ð¸Ñ?Ðº Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? Ð¸ Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor. Ð?Ð»Ð°Ð³Ð¾Ð´Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ð¼Ñ? Ð²Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð² Ñ?ÐµÑ?Ð¸ Tor Ð¾Ñ?Ñ?Ð»ÐµÐ´Ð¸Ñ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Ð¡Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?, Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6, Ð½Ð¾ Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð»Ñ?Ñ?Ð°ÐµÐ² Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð° Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼ IPv6 Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?.\n"
+msgstr "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ð°ÐºÐ¶Ðµ IPv6, Ð½Ð¾ Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ðµ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ñ? Ð½Ðµ Ñ?Ð¾Ð²Ð¼ÐµÑ?Ñ?Ð¸Ð¼Ñ? Ñ? IPv6.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ð?Ð¾Ð»ÐµÐµ Ñ?Ð¾Ð³Ð¾, BridgeDB Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s, Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ð¹ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? %s, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð²Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð° Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°, Ñ?Ð°Ðº-Ð¶Ðµ Ð¾Ð½Ð¸ Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð¾Ð±Ð¾Ð¹Ñ?Ð¸ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?.\n"
+msgstr "Ð?Ñ?Ð¾Ð¼Ðµ Ñ?Ð¾Ð³Ð¾, BridgeDB Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾ Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s Ð±ÐµÐ· ÐºÐ°ÐºÐ¸Ñ?-Ð»Ð¸Ð±Ð¾\nÐ¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð¾Ð² %s. ÐÑ?Ð¾ Ð½Ðµ Ñ?Ð°Ðº ÐºÑ?Ñ?Ñ?Ð¾ Ð²Ñ?Ð³Ð»Ñ?Ð´Ð¸Ñ?, Ð½Ð¾ Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?\nÐ¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð¾Ð±Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
-msgstr "Ð§Ñ?Ð¾ Ñ?Ð°ÐºÐ¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ??"
+msgstr "Ð§Ñ?Ð¾ Ñ?Ð°ÐºÐ¾Ðµ Ð¼Ð¾Ñ?Ñ??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ð¾Ñ?Ñ? %s â?? Ñ?Ñ?Ð¾ Ñ?ÐµÑ?ÐµÐ²Ð¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð² Ñ?ÐµÑ?Ð¸ Tor, ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð²Ð°Ð¼ Ð¿Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð°Ð¹Ñ?Ñ?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ,  Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²: %s, %s Ð¸Ð»Ð¸ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð¼! Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ñ?Ð»Ð¸ Tor Ð½Ðµ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°ÐµÑ?Ñ?Ñ?, Ð½Ð°Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼ Ð½Ð° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?Ð»Ñ? Ð±Ñ?Ñ?Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð²Ð°Ñ?ÐµÐ¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ð² Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ðµ, Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? Ð¸Ð¼Ñ? Ð¼Ð¾Ñ?Ñ?Ð° Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ, ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ðµ Ð²Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð»Ð¸ Ð´Ð»Ñ? Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?, Ð° Ñ?Ð°ÐºÐ¶Ðµ Ð²ÐµÑ?Ñ?Ð¸Ñ? Tor Browser."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?Ñ?Ð»Ð¸ Tor Browser Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° %s Ð¸ %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð¡Ñ?Ñ?Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ? Ñ?Ð°Ñ?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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 "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ñ?Ð°Ñ?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ? \"HTTPS\" Ð¿ÐµÑ?ÐµÐ´Ð°ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· Ñ?Ñ?Ð¾Ñ? Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?. Ð§Ñ?Ð¾Ð±Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?\nÐ¼Ð¾Ñ?Ñ?Ñ?, Ð¿ÐµÑ?ÐµÐ¹Ð´Ð¸Ñ?Ðµ Ð½Ð° %sbridges.torproject.org%s, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ð¸ Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð¸\nÑ?ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ñ?Ñ? ÐºÐ°Ð¿Ñ?Ñ?."
+
+#: bridgedb/strings.py:119
+#, 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:125
+#, 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 "Ð?Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ð¸ Ð¼Ð¾Ð³Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Ð¸Ð· Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð° Ñ?Ð°Ñ?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ? \"ÐÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð°Ñ? Ð¿Ð¾Ñ?Ñ?Ð°\", Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ð²\nÑ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ñ? %sbridges@xxxxxxxxxxxxxx%s Ð¸ Ð½Ð°Ð¿Ð¸Ñ?Ð°Ð² \"get transport obfs4\"\nÐ² Ñ?ÐµÐ»Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð°."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?ÐµÑ?"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð´ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð§Ñ?Ð¾Ð±Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ð¹ Ð¼Ð¾Ñ?Ñ? Ð² %s Tor Browser, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Tor Browser %s Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ð¿Ð¾ Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ð½Ð¸Ñ? Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÑ? 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor', Ð´Ð°Ð»ÐµÐµ Ð½Ð°Ð¶Ð°Ñ?Ñ? 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?' Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°, Ð¿Ð¾ÐºÐ° Ð²Ñ? Ð½Ðµ Ñ?Ð²Ð¸Ð´Ð¸Ñ?Ðµ Ð²Ð¾Ð¿Ñ?Ð¾Ñ?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ð»ÐµÐµ'. Ð?Ð»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð²Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¸\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²Ð¾Ð´Ð° Ñ?ÐµÐºÑ?Ñ?Ð°. Ð? Ð½Ð°Ð¶Ð¸Ð¼Ð°ÐµÑ?Ðµ 'Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?'! Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼, Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ 'Ð?Ð¾Ð¼Ð¾Ñ?Ñ?'\nÐ²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor' Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ñ?Ð²Ð¾Ð´Ð¸Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¾Ð¹ IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð¿Ð¸Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð¾Ð³Ð¾ GnuPG-ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
index 23e3b7d..ec68c47 100644
--- a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,12 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # elo, 2014
 # FooBar <thewired@xxxxxxxxxx>, 2015
 # Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>, 2019
+# MatÃºÅ¡ <mato699@xxxxxxxxx>, 2019
 # Michal SlovÃ¡k <michalslovak2@xxxxxxxxxxx>, 2013
 # Roman 'Kaktuxista' Benji <romanbeno273@xxxxxxxxx>, 2014
 # StefanH <inactive+StefanH@xxxxxxxxxxxxx>, 2014
@@ -13,116 +14,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-10 06:45+0000\n"
-"Last-Translator: Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "NahlÃ¡siÅ¥ chybu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "PoslednÃ© zmeny"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "OznaÄ?iÅ¥ vÅ¡etko"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "ZobraziÅ¥ QR KÃ³d"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kÃ³d vaÅ¡ich premostenÃ"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Do pekla!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "ZdÃ¡ sa Å¾e nastala chyba pri zÃskavanÃ vÃ¡Å¡ho QR kÃ³du."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Tento QR kÃ³d obsahuje vaÅ¡e prehostenia. MoÅ¾ete ho zoskenovaÅ¥ Ä?ÃtaÄ?kou QR kÃ³dov, ktorou ich skopÃrujete do mobilu Ä?i inÃ½ch zariadenÃ"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "PrÃ¡ve niesÃº dostupnÃ© Å¾iadne premostenia..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾no by ste mohli skÃºsiÅ¥ %s ÃsÅ¥ spÃ¤Å¥ %s a vybraÅ¥ si inÃ½ typ premostenia."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "StiahnuÅ¥ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskajte %s premostenia %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
@@ -131,27 +147,27 @@ msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sen mi zobrazte premostenia!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "PokroÄ?ilÃ© moÅ¾nosti"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Å¾iadne"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÃ?%sno!"
@@ -159,69 +175,37 @@ msgstr "%sÃ?%sno!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastaviÅ¥ Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Toto je automatickÃ¡ sprÃ¡va; prosÃm, neodpovedajte.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "PrekroÄ?ili ste rate limit. ProsÃm spomaÄ¾te. MinimÃ¡lny Ä?as medzi emailmi je %s hodÃn. VÅ¡etky dalÅ¡ie emaily poÄ?as tejto doby budÃº ignorovanÃ©."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "PRÃ?KAZY: (kombinujte prÃkazy na zadanie viac moÅ¾nostÃ naraz)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Vitajte v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "PrÃ¡ve podporovanÃ© transport typy:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ahoj, priateÄ¾!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Tento email bol generovanÃ½ s dÃºhami, jednoroÅ¾cami a trblietkami pre %s dÅ?a %s o %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +216,7 @@ msgid ""
 msgstr "BridgeDB vÃ¡m dokÃ¡Å¾e ponÃºknuÅ¥ niekolko typov %spremostenÃ s Pluggable Transports%s,\nktorÃ© vÃ¡m pomÃ´Å¾u maskovaÅ¥ vaÅ¡e pripojenie na Tor Network, ktorÃ© ztaÅ¾Ã kaÅ¾dÃ©mu kto sleduje vaÅ¡e internetovÃ© pripojenie zistiÅ¥ to Å¾e pouÅ¾Ãvate Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -244,7 +228,7 @@ msgstr "NiektorÃ© premostenia s IPv6 adresami sÃº taktieÅ¾ dostupnÃ©, ale niekto
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +237,169 @@ msgid ""
 "\n"
 msgstr "DodatoÄ?ne, BridgeDB mÃ¡ dosÅ¥ pÃ´vodnych premostenÃ %s bez Å¾iadnych Pluggable Transports %s ktorÃ© moÅ¾no niesu aÅ¾ takÃ© cool, ale vo veÄ¾a prÃpadoch stÃ¡le dokÃ¡Å¾u obÃsÅ¥ cenzÃºrovanie internetu.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ä?o sÃº to premostenia?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s premostenia %s sÃº Tor relaye ktorÃ© vÃ¡m pomÃ¡haju obÃsÅ¥ cenzÃºru."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Potrebujem inÃ½ spÃ´sob ako zÃskaÅ¥ premostenia!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "DalÅ¡Ãm spÃ´sobom ako zÃskaÅ¥ premostenia je poslaÅ¥ mail na %s. \nEmail vÅ¡ak musÃte poslaÅ¥ pomocou adresy od jednÃ©ho z tÃ½chto poskytovateÄ¾ov:\n%s, %s alebo %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Moje premostenia nefungujÃº! Potrebujem pomoc!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ak vÃ¡Å¡ Tor nefunguje, skÃºste napÃsaÅ¥ email %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "SkÃºste napÃsaÅ¥ Ä?o najviac informaciÃ o vaÅ¡om prÃpade, vrÃ¡tane zoznamu premostenÃ a Pluggable Transportov ktorÃ© ste skÃºÅ¡ali pouÅ¾iÅ¥, verzia Tor Browseru, a hlÃ¡Å¡ky ktorÃ© Tor vypÃsal, apod."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ak sa vÃ¡Å¡ prehliadaÄ? Tor nemÃ´Å¾e pripojiÅ¥,  skÃºste sa pozrieÅ¥ na %s a na naÅ¡u %s. "
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "ZÃskaÅ¥ premostenia!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Å½iadny"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "ProsÃm vyberte si moÅ¾nosti na typ premostenia:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 adresy?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prehliadaÄ? nezobrazuje obrÃ¡zky sprÃ¡vne."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "VloÅ¾te znaky z obrÃ¡zku vyÅ¡Å¡ie..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ako zaÄ?aÅ¥ pouÅ¾ÃvaÅ¥ vaÅ¡e premostenia"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Na zadanie premostenÃ do Tor Browsera, najprv choÄ?te na download strÃ¡nku %s %s Tor Browsera a riaÄ?te sa inÅ¡trukiacmi na stiahnutie a zapnutie Tor Browsera."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blokuje alebo nejak cenzuruje vÃ¡Å¡ PoskytovateÄ¾ Internetu (ISP) pripojenia k Sieti Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "OznaÄ?te 'Ã?no' a potom kliknite na 'Ä?alej'.  Na konfigurÃ¡ciu novÃ½ch premostenÃ, skopÃrujte premostenia do polÃÄ?ka na text. Potom kliknite na 'PripojiÅ¥' a uÅ¾ by to malo fungovaÅ¥. Ak mÃ¡te nejakÃ© problemy, kliknite na tlaÄ?idlo 'Pomoc' v 'Tor sieÅ¥ovÃ½ch nastaveniach' pre viac informaciÃ. "
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "ZobrazÃ tÃºto sprÃ¡vu."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PoÅ¾iadaÅ¥ o pÃ´vodnÃ© premostenia."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PoÅ¾iadaÅ¥ o IPv6 premostenia."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PoÅ¾iadaÅ¥ o Pluggable Transport podla typu."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Stiahnite si kÃ³piu verejnÃ©ho klÃºÄ?a GNUPG  pre BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
index 8f70002..de1480a 100644
--- a/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Lovro Drofenik <lovro.drofenik@xxxxx>, 2018
@@ -11,116 +11,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-16 06:52+0000\n"
-"Last-Translator: Rok Kepa <rokkepa@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! Z vaÅ¡o zahtevo je bilo nekaj narobe."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Prijavi napako"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Izvorna koda"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Novosti"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Stik"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vse"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PrikaÅ¾i QR kodo"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR koda za mostovne povezave"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, Å¡pageti :)"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Napak pri izdelavi QR kode"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR koda vsebuje mostovne povezave. Slikaj kodo za kopiranje mostovnih povezav na mobilne in druge naprave."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno ni na voljo mostovnih povezav..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MogoÄ?e je bolje, Ä?e %s greÅ¡ nazaj %s in izbereÅ¡ drugo vrsto mosta."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Korak %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Poberi %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dobi %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
@@ -129,27 +144,27 @@ msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo dodaj mostove!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Napredno"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niÄ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -157,69 +172,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sobi mostove"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[To je avtomatsko sporoÄ?ilo. Ne odgovarjaj.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Tvoji mostovi:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Presegel si omejitve. UpoÄ?asni! NajmanjÅ¡i Ä?as me email-i je %s ur. Vsi naslednji email-i bojo spredlegani."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ukazi: (zdruÅ¾ite ukaze razliÄ?nih moÅ¾nosti hkrati) "
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "DobrodoÅ¡li v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podprti TIPI:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Oj, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Pozdravljen!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Javni kljuÄ?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ta email so zgenerirani Å¡kratje iz Narnije za %s na %s pri %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
 msgstr "BridgeDB zagotavljajo mostiÄ?ke z razliÄ?nimi %stipi Pluggable prevozi%s,\nki lahko pomagajo zmesti vaÅ¡o povezavo z Tor omreÅ¾jem, in jo naredijo bolj\nnepregledno za vsakogar, ki spremlja vaÅ¡ internetni promet z namenom ugotavljanja\nuporabe Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,7 @@ msgstr "Nekateri mostiÄ?ki z IPv6 naslovi so tudi dosegljivi, Ä?eprav nekateri P
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
 "\n"
 msgstr "Dodatno, BridgeDB ima mnogo nezanimih mostiÄ?kov %s brez kakrÅ¡njihkoli\ntransportnih vtiÄ?nikov %s ki morda ne zvenijo dobro, vendar Å¡e vedno\npomagajo pri preslepitvi internetne cenzure v mnogih primerih\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Kaj so mostovi?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Mostovi %s so Tor releji, ki pomagajo zaobiti cenzuro."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Potrebujem drug naÄ?in za priti do mosta!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Drug naÄ?in za zbiranje mostiÄ?kov je preko naÅ¡e e-poÅ¡te %s. Zapomnite si, da morate poslati e-pismo z uporabo naslova naslednjih e-poÅ¡tnih ponudnikov\n%s, %s ali %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Moji mostovi ne delujejo! Potrebujem pomoÄ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ä?e vaÅ¡ Tor brskalnik ne deluje, poÅ¡ljite elektronsko poÅ¡to na naslov %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Poskusite vkljuÄ?iti Ä?im veÄ? informacij o vaÅ¡em primeru,\nvkljuÄ?no s seznamom\nmostiÄ?kov in transportnih vtiÄ?nikov, ki ste jih uporabili, verzijo Tor iskalnik\nin vsa sporoÄ?ila, ki vam jih je dal Tor, itd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Tu so vrstice mostiÄ?kov:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Pridobite si mostiÄ?ke!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "NiÄ?"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Izberite tip mostiÄ?ka:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 naslove?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ brskalnik ne prikazuje slik pravilno."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Vnesite znake vsebovane v zgornji sliki..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Kako zaÄ?eti uporabljati svoje mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Da 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ali vaÅ¡ ponudnik internetnih storitev (ISP) blokira ali kako drugaÄ?e cenzurira povezave na Tor omreÅ¾je?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Izberite 'Da' in nato kliknite 'Naprej'. Za nastavitev vaÅ¡ih novih mostov, kopirajte in prilepite povezave mostov v prostor za vnos besedila. Zdaj pritisnite 'PoveÅ¾i' in moralo bi delovati! Ä?e se pojavijo problemi poskusite klikniti tipko 'PomoÄ?' v Ä?arovniku za 'Nastavitve Tor omreÅ¾ja' za nadaljnjo pomoÄ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "PrikaÅ¾i to sporoÄ?ilo."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Zahteva za vanilla mostiÄ?ke."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Zaprosi za IPv6 mostove."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Zahtevjte transportne vtiÄ?nike po tipu."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Pridobite kopijo javnega GnuPG kljuÄ?a za BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
index e3c8f9b..8e9c340 100644
--- a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
@@ -1,124 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Bujar Tafili, 2015
 # Mirela Pacani <milela00@xxxxxxxxx>, 2016
+# obial <oltionb@xxxxxxxxx>, 2019
+# Skender Mustafi <1mail2me@xxxxxxxxx>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: Besnik <besnik@xxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "GjuhÃ«"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Raportoni njÃ« gabim"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
-msgstr "Kodi Burimor"
+msgstr "Kodi BazÃ«"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Regjistri i ndryshimeve"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "PÃ«rzgjidhini tÃ« Gjitha"
+msgstr "Zgjidhi tÃ« Gjitha"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tregoni Kodin QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "Kodi QR pÃ«rlinjat e urave tuaja"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ã?farÃ« tersi!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "Kodi QR pÃ«r linjat e urave tuaja"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
-msgstr "Duket se u has njÃ« gabim, duke marrÃ« Kodin tuaj QR."
+msgstr "Ndodhi njÃ« gabim nÃ« marrjen e Kodit tuaj QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Ky Kod QR pÃ«rmban linja urash. Skanojeni me njÃ« lexues Kodi QR, qÃ« t'i kopjoni linjat e urave tuaja nÃ« celular, apo nÃ« pajisje tÃ« tjera."
+msgstr "Ky Kod QR pÃ«rmban linjat e urave tuaja. Skanojeni me njÃ« lexues Kodi QR, qÃ« tÃ« kopjoni linjat e urave tuaja nÃ« celular, apo pajisje tÃ« tjera."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
-msgstr "KÃ«tÃ« Ã§ast s'ka asnjÃ« urÃ« tÃ« disponueshme..."
+msgstr "PÃ«r momentin nuk ka ura tÃ« disponueshme..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Ndoshta duhet tÃ« provoni tÃ« %s shkoni prapa %s dhe tÃ« zgjidhni njÃ« lloj tÃ« ndryshÃ«m ure!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Hapi %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Shkarkoni %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Hapi %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Merrni %s ura %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Hapi %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tani %s shtojini urat tek Tor Browser %s"
@@ -127,27 +144,27 @@ msgstr "Tani %s shtojini urat tek Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sÃ« jepni urat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opsionet e PÃ«rparuara"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Jo"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "asnjÃ«"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sP%so!"
@@ -155,69 +172,37 @@ msgstr "%sP%so!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sM%serrni Urat"
+msgstr "%sM%serr Urat"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ky Ã«shtÃ« njÃ« mesazh automatik; ju lutemi mos u pÃ«rgjigjni.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
-msgstr "KÃ«tu janÃ« urat tuaja:"
+msgstr "Ja ku janÃ« urat tuaja:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Ju e keni kapÃ«rcyer kufirin. Ju lutemi, mÃ« ngadalÃ«! Koha minimum midis \ne-postave Ã«shtÃ« %s orÃ«. TÃ« gjitha e-postat e tjera gjatÃ« kÃ«saj periudhe kohe do tÃ« injorohen."
+msgstr "Ju e keni kapÃ«rcyer kufirin e shpejtÃ«sisÃ«. Ju lutemi, mÃ« ngadalÃ«! Koha minimum midis \nmesazheve elektronike Ã«shtÃ« %s orÃ«. TÃ« gjitha mesazhet elektronike gjatÃ« kÃ«saj periudhe kohe do tÃ« injorohen."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombinojini COMMANDs pÃ«r tÃ« specifikuar zgjedhje tÃ« shumÃ«fishta njÃ«kohÃ«sisht)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "MirÃ« se erdhÃ«t tek BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs tÃ« mbÃ«shtetura kÃ«tÃ« Ã§ast: "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "PÃ«rshÃ«ndetje mik!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "KyÃ§a PublikÃ«"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Kjo e-postÃ« Ã«shtÃ« gjeneruar me ylberÃ«, njÃ«brirÃ«sha dhe shkÃ«ndija\npÃ«r %s, mÃ« %s, nÃ« orÃ«n %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +213,7 @@ msgid ""
 msgstr "BridgeDB mund tÃ« ofrojÃ« ura me shumÃ« %slloje tÃ« Pluggable Transports%s,\nqÃ« mund tÃ« ndihmojÃ« fshehjen e lidhjeve tuaja pÃ«r Tor Network, duke e bÃ«rÃ« atÃ« mÃ« \ntÃ« vÃ«shtirÃ« pÃ«r kÃ«do qÃ« vÃ«zhgon trafikun tuaj tÃ« internetit, pÃ«r tÃ« pÃ«rcaktuar nÃ«se ju jeni\nduke pÃ«rdorur Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -240,7 +225,7 @@ msgstr "Disa ura me adresa IPv6 janÃ« po ashtu tÃ« mundshme, ndonÃ«se disa Plugg
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +234,169 @@ msgid ""
 "\n"
 msgstr "PÃ«rveÃ§ kÃ«saj, BridgeDB ka shumÃ« ura %s tÃ« bezdisshme, pa ndonjÃ«\nPluggable Transports %s, Ã§ka ndoshta nuk do tÃ« tingÃ«llojÃ« mirÃ«, por ata ende\nmund tÃ« ndihmojnÃ« qÃ« ta anashkaloni censurÃ«n e internetit nÃ« shumÃ« raste.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ã?'janÃ« urat?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Urat %s janÃ« rele Tor, qÃ« ju ndihmojnÃ« tÃ« anashkaloni censurÃ«n."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "MÃ« nevojitet njÃ« mÃ«nyrÃ« alternative pÃ«r pÃ«rftimin e urave!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "NjÃ« mÃ«nyrÃ« tjetÃ«r pÃ«r tÃ« pÃ«rftuar ura Ã«shtÃ« tÃ« dÃ«rgoni njÃ« e-postÃ« tek %s. ju lutemi vini re se ju duhet\nta dÃ«rgoni e-postÃ«n, duke pÃ«rdorur njÃ« adresÃ« nga njÃ«ri prej ofruesve tÃ« e-postÃ«s nÃ« vijim:\n%s, %s ose %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Urat e mia nuk punojnÃ«! MÃ« duhet ndihmÃ«!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "NÃ«se Tor i juaj nuk punon, ju duhet t'i dÃ«rgoni e-postÃ« %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PÃ«rpiquni tÃ« pÃ«rfshini sa mÃ« shumÃ« informacion qÃ« tÃ« mundeni rreth rastit tuaj, duke vendosur edhe listÃ«n e\nurave dhe Pluggable Transports qÃ« provuat tÃ« pÃ«rdorni, versionin tuaj tÃ« Tor Browser,\nsi dhe Ã§do mesazh qÃ« ka dhÃ«nÃ« Tor, etj."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "KÃ«tu janÃ« linjat e urave tuaja:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Merrni Ura!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "AsnjÃ«"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ju lutemi pÃ«rzgjidhni mundÃ«sitÃ« pÃ«r llojin e urÃ«s:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "A ju nevojiten adresat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "A ju nevojitet njÃ« %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Futini karakteret nga imazhi mÃ« sipÃ«r..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Si tÃ« nisni t'i pÃ«rdorni urat tuaja"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "A i pengon apo i censuron Ofruesi juaj i ShÃ«rbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "PÃ«rzgjidhni \"Po\" dhe mÃ« pas klikoni \"Tjetri\". QÃ« tÃ« konfiguroni urat tuaja tÃ« reja, kopjojini dhe\nngjitini linjat e urave nÃ« kutinÃ« e futjes sÃ« tekstit. MÃ« nÃ« fund, klikoni \"Lidhuni\", dhe\ndo tÃ« jeni gati pÃ«r t'ia nisur! NÃ«se do tÃ« pÃ«rjetoni probleme, pÃ«rpiquni tÃ« klikoni butonin \"NdihmÃ«\" \ntek asistenti i \"Konfigurimit tÃ« Rrjetit Tor\", pÃ«r mÃ« shumÃ« mbÃ«shtetje."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Shfaq kÃ«tÃ« mesazh."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "KÃ«rkoni urat vanilje ose non-Pluggable Transport."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "KÃ«rkoni urat IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "KÃ«rkoni njÃ« Pluggable Transport nÃ«pÃ«rmjet TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Merrni njÃ« kopje tÃ« kyÃ§it publik GnuPG tÃ« BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
index cf9b486..4dd6851 100644
--- a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Aleksa RistiÄ?, 2019
 # an lykin <lykin@xxxxxxxxxxxxxx>, 2018
 # Pseudoscops, 2018
@@ -16,116 +15,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-07-10 11:07+0000\n"
-"Last-Translator: Aleksa RistiÄ?\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?Ð¾Ð³Ð¾Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð¸Ð·Ð¼ÐµÐ½Ð°"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð²Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð£Ñ?, Ñ?Ñ?Ñ?Ð°Ñ?Ð½Ð¾!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¾ Ð´Ð¾ Ð³Ñ?ÐµÑ?ÐºÐµ Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ QR kÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR ÐºÐ¾Ð´ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð³Ð° Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¸Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ðµ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ %s Ð´Ð° Ñ?Ðµ Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¼Ð¸Ñ?Ðµ %s Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ?%s"
@@ -134,27 +148,27 @@ msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½ÐµÐ¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ¾!"
@@ -162,69 +176,37 @@ msgstr "%sÐ¢%sÐ¾!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ð²Ð¾ Ñ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°; Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð²Ð°Ñ? Ð´Ð° Ð½Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ðµ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¸Ð³Ð»Ð¸ Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð»Ð¸Ð¼, Ñ?Ñ?Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð¸Ð·Ð¼ÐµÑ?Ñ?\nÐµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ðµ %s Ñ?Ð°Ñ?Ð¸. Ð¡Ð²Ð° Ð½Ð°Ñ?ÐµÐ´Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ð¾ÐºÐ¾Ð¼ Ð¾Ð²Ð¾Ð³ Ð¿ÐµÑ?Ð¸Ð¾Ð´Ð° Ð±Ð¸Ñ?Ðµ Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°.  "
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ñ?Ñ?Ñ?Ðµ COMMANDs Ð´Ð° Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ð²Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð¸Ñ?Ñ?Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾Ð´Ð¾Ñ?Ð»Ð¸ Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð¢Ð?Ð? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð°:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ñ?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ?ÐµÐ²Ð¸"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?Ð²Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ñ?ÐµÐ½Ð° Ñ?Ð° Ð´Ñ?Ð³Ð°Ð¼Ð°, Ñ?ÐµÐ´Ð½Ð¾Ñ?Ð¾Ð·Ð¸Ð¼Ð° Ð¸ Ð·Ð²ÐµÐ·Ð´Ð¸Ñ?Ð°Ð¼Ð°\nÐ·Ð° %s Ñ? %s Ñ? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +217,7 @@ msgid ""
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ %s Ñ?Ð¸Ð¿Ð¾Ð²Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð° %s,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ð¸Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ñ?Ð° Ñ?Ð° Ð?Ñ?ÐµÐ¶Ð¾Ð¼ Ð¢Ð¾Ñ?, ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð±Ð¸Ð»Ð¾\nÐºÐ¾Ð¼Ðµ ÐºÐ¾ Ð¿Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÐ½ÐµÑ? Ñ?Ð°Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð±Ð¸Ð»Ð¾ Ñ?ÐµÐ¶Ðµ Ð´Ð° Ñ?Ñ?Ð²Ñ?Ð´Ð¸ Ð´Ð°\nÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -247,7 +229,7 @@ msgstr "Ð?ÐµÐºÐ¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ñ?Ð° IPv6 Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð° Ñ?Ñ? Ñ?Ð°Ðº
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +238,169 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ñ?ÐµÐ´ Ñ?Ð¾Ð³Ð°, BridgeDB Ð¸Ð¼Ð° Ð¿Ñ?Ð½Ð¾ Ð½Ð°Ñ?Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° %s Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¸Ñ?\nÐ¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð° %s Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ Ñ?Ð¾Ð»Ð¸ÐºÐ¾ ÐºÑ?Ð», Ð°Ð»Ð¸ Ð¾Ð½Ð¸ Ð¸Ð¿Ð°Ðº\nÑ? Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ²Ð° Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð¾Ð±Ð¸Ñ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð° Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ %s Ñ?Ñ? Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð½Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸ Ð?Ð°Ð¼ Ð¿Ð¾Ð¼Ð°Ð¶Ñ? Ð´Ð° Ð·Ð°Ð¾Ð±Ð¸Ñ?ÐµÑ?Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð¼Ð¸ Ñ?Ðµ Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð·Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ð¾Ñ? Ñ?ÐµÐ´Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¸-Ð¼ÐµÑ?Ð» Ð½Ð° %s. Ð£Ð·Ð¼Ð¸Ñ?Ðµ Ñ? Ð¾Ð±Ð·Ð¸Ñ? Ð´Ð°\nÐ¼Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¸-Ð¼ÐµÑ?Ð» ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¾Ð´ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¸-Ð¼ÐµÑ?Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð°.\n%s, %s Ð¸Ð»Ð¸ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ð½Ðµ Ñ?Ð°Ð´Ðµ! Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð¼Ð¸ Ñ?Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ð?Ð°Ñ? Ð¢Ð¾Ñ? Ð½Ðµ Ñ?Ð°Ð´Ð¸, Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?Ñ? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¾ Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð° Ð¾ Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð° Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ð¸Ð²Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, \nÐ²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ Ñ?Ð¾Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð°, Ð±Ð¸Ð»Ð¾ \nÐºÐ¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ñ?Ñ? Ð²Ð°Ð¼ Ñ?Ðµ Ð¢Ð¾Ñ? Ð¸Ð·Ð±Ð°Ñ?Ð¸Ð¾, Ð¸Ñ?Ð´."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?Ð¸Ñ?ÐµÐ´Ð°Ð½"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ?, Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ñ? Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ IPv6 Ð°Ð´Ñ?ÐµÑ?Ðµ?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð?Ð°Ð¼ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð½Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÐµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ Ñ?Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð·Ð½Ð°Ð´..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? Tor, Ð¿Ñ?Ð²Ð¸ Ð¸Ð´Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð¸ %s Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ %s \nÐ¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¸ Ñ?Ð°Ð¼Ð¾ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³ 'Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ðµ' Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¸' Ð¸ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð´Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ð°:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð?Ð° Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (Ð?Ð¡Ð?) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ'. Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ñ?Ð²Ð¾Ñ?Ðµ Ð½Ð¾Ð²Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ½Ð°Ð»ÐµÐ¿Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ðµ Ð·Ð° Ñ?Ð½Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°. Ð?Ð¾Ð½Ð°Ñ?Ð½Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'ÐºÐ¾Ð½ÐµÐºÑ?Ñ?Ñ? Ñ?Ðµ', i\nÐ¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ! Ð?ÐºÐ¾ Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¸Ð¼Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÑ? Ñ?Ð°Ñ?Ð¾Ð±Ñ?Ð°ÐºÐ· Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ Ð¢Ð¾Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° Ð±Ð°Ð·Ð¸Ñ?Ð½Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° IPv6 Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ±Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð¿Ð¾ Ð¢Ð?Ð?Ð£."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? ÐºÑ?Ñ?Ñ?Ð° BridgeDB Ñ?Ð°Ð²Ð½Ð¾Ð³ GnuPG."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
index 8cc0f27..d401de5 100644
--- a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,14 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Anders Jensen-Urstad <anders@xxxxxxx>, 2014
 # Emil Johansson <emil.a.johansson@xxxxxxxxx>, 2015
 # Gabor Sebastiani, 2014
 # Jacob Andersson <jacob.c.andersson@xxxxxxxxxxxxxx>, 2018
-# Jonatan Nyberg, 2017
-# Jonatan Nyberg, 2018-2019
+# Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>, 2017
+# Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>, 2018-2020
 # Peter Michanek <peter@xxxxxxxxxxx>, 2015
 # Petomatick <petomatick@xxxxxxxxxxx>, 2011
 # ph AA, 2015
@@ -19,116 +19,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-01 08:49+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-19 05:32+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Rapportera ett fel"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "KÃ¤llkod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ã?ndringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Markera allt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Visa QR-kod"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kod fÃ¶r dina brorader"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Bomber och granater, nÃ¥got gick snett!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det verkar som att ett fel orsakade problem att fÃ¥ din QR-kod."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denna QR-kod innehÃ¥ller dina rader med broar. Skanna den med en QR-kodlÃ¤sare fÃ¶r att kopiera dina rader med broar till mobila och andra enheter."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB stÃ¶tte pÃ¥ ett fel."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "FÃ¶r nÃ¤rvarande finns inga broar tillgÃ¤ngliga..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Prova att %s gÃ¥ tillbaka %s fÃ¶r att vÃ¤lja en annan typ av bro!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "HÃ¤mta %s Tor Browser  %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Skaffa %s broar %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
@@ -137,27 +152,27 @@ msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sara ge mig broar!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avancerade instÃ¤llningar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "inget"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -165,69 +180,37 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sÃ¤mta broar"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Detta Ã¤r ett automatiskt meddelande; Var god svara ej]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Detta Ã¤r ett automatiserat e-postmeddelande.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "HÃ¤r Ã¤r dina broar:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har Ã¶verskridit din nivÃ¥. Ta det lugnt! Minsta tillÃ¥tna tiden mellan epost Ã¤r %s timmar. Epost utÃ¶ver detta kommer att ignoreras."
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOn: (kombinera KOMMANDOn fÃ¶r att ange flera val pÃ¥ en gÃ¥ng)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "VÃ¤lkommen till BridgeDB!"
+msgstr "Du har Ã¶verskridit grÃ¤nsvÃ¤rdet. SnÃ¤lla sakta ner! Minsta tillÃ¥tna tiden mellan e-postmeddelanden Ã¤r %s timmar. Alla ytterligare e-postmeddelanden utÃ¶ver detta kommer att ignoreras under denna tidsperiod."
 
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "FÃ¶r nÃ¤rvarande stÃ¶ds fÃ¶ljande transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hej, kompis!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Publika nycklar"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Det hÃ¤r mailet skapades med hjÃ¤lp av regnbÃ¥gar, enhÃ¶rningar och \nett regn av gnistor fÃ¶r %s den %s kl %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Om dessa broar inte Ã¤r vad du behÃ¶ver, svara pÃ¥ detta e-postmeddelande med en av\nfÃ¶ljande kommandon i meddelandebrÃ¶dtexten:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,158 +218,193 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB kan tillhandahÃ¥lla broar med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gÃ¶r det svÃ¥rare fÃ¶r nÃ¥gon\nsom avlyssnar din internetuppkoppling att veta ifall du anvÃ¤nder Tor.\n\n"
+msgstr "BridgeDB kan tillhandahÃ¥lla broar med flera %styper av Pluggbara transporter%s,\nsom kan omforma din trafik till Tor-nÃ¤tverket, vilket gÃ¶r det svÃ¥rare fÃ¶r nÃ¥gon\nsom avlyssnar din internetuppkoppling att veta ifall du anvÃ¤nder Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Det finns nÃ¥gra broar med IPv6-adresser tillgÃ¤ngliga, men vissa Pluggable\nTransports Ã¤r inte IPv6-kompatibla.\n"
+msgstr "Det finns nÃ¥gra broar med IPv6-adresser tillgÃ¤ngliga, men vissa Pluggbara\nÂ transporter Ã¤r inte IPv6-kompatibla.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Dessutom har BridgeDB nÃ¥gra alldeles vanliga 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"
+msgstr "Dessutom har BridgeDB nÃ¥gra alldeles vanliga broar %s utan Pluggbara\ntransporter %s vilket kanske inte lÃ¥ter sÃ¥ hÃ¤ftigt, men i mÃ¥nga fall kan de \nfortfarande hjÃ¤lpa dig med att kringgÃ¥ internet-censur.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Vad Ã¤r broar?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Broar %s Ã¤r Tor-relÃ¤er som hjÃ¤lper dig kringgÃ¥ censur."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa broar pÃ¥!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ett annat sÃ¤tt att fÃ¥ nya broar Ã¤r att skicka e-post till %s. Du mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande e-postleverantÃ¶rer:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ett annat sÃ¤tt att fÃ¥ broar Ã¤r att skicka ett e-postmeddelande till %s. LÃ¤mna Ã¤mnet fÃ¶r e-postmeddelandet\ntomt och skriv \"get transport obfs4\" i e-postmeddelandet. VÃ¤nligen observera\natt du mÃ¥ste skicka e-postmeddelandet med en adress frÃ¥n ett av fÃ¶ljande e-post-\nleverantÃ¶rer: %s eller %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Mina broar fungerar inte! Jag behÃ¶ver hjÃ¤lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor inte fungerar fÃ¶r dig sÃ¥ kan du e-posta %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "FÃ¶rsÃ¶k att berÃ¤tta sÃ¥ mycket om problemet som du kan, bland annat vilka\nbroar och Pluggable Transports som du fÃ¶rsÃ¶kt anvÃ¤nda, vilken version av Tor Browser du anvÃ¤nder, vilka felmeddelanden som Tor visat, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Om din Tor Browser inte kan ansluta, vÃ¤nligen ta en titt pÃ¥ %s och vÃ¥ra %s."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "HÃ¤r Ã¤r dina rader med broar:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Skaffa broar!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "BrofÃ¶rdelningsmekanismer"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 implementerar fyra mekanismer fÃ¶r att distribuera broar: \"HTTPS\", \"Moat\",\n\"E-mail\" och \"Reserved\". Broar som inte distribueras Ã¶ver BridgeDB anvÃ¤nder\npseudo-mekanismen \"None\". FÃ¶ljande lista fÃ¶rklarar kortfattat hur dessa\nmekanismer fungerar och vÃ¥ra %sBridgeDB statistik%s visualisera hur populÃ¤r varje\nmekanismer Ã¤r."
+
+#: bridgedb/strings.py:115
+#, 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 "Distributionsmekanismen \"HTTPS\" delar ut broar Ã¶ver denna webbplats. FÃ¶r att\nfÃ¥ broar, gÃ¥ till %sbridges.torproject.org%s, vÃ¤lj ditt Ã¶nskade alternativ och\nlÃ¶s efterfÃ¶ljande CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, 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 "Distributionsmekanismen \"Moat\" Ã¤r en del av Tor Browser, sÃ¥ att anvÃ¤ndarna kan\nbegÃ¤r broar inifrÃ¥n sina instÃ¤llningar i Tor Browser. FÃ¶r att fÃ¥ broar, gÃ¥ till\ndina %sTor-instÃ¤llningar%s i Tor Browser, klicka pÃ¥ \"begÃ¤r en ny bro\", lÃ¶s\nfÃ¶ljande CAPTCHA och Tor Browser kommer automatiskt lÃ¤gga till dina nya\nbroar."
+
+#: bridgedb/strings.py:125
+#, 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 "AnvÃ¤ndare kan begÃ¤ra broar frÃ¥n distributionsmekanismen \"Email\" genom att skicka en\ne-post till %sbridges@xxxxxxxxxxxxxx%s och skriva \"get transport obfs4\" i\ne-postbrÃ¶dtexten."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserved"
+
+#: bridgedb/strings.py:130
+#, 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 upprÃ¤tthÃ¥ller ett litet antal broar som inte distribueras\nautomatiskt. IstÃ¤llet reserverar vi dessa broar fÃ¶r manuell distribution och\ndela ut dem till icke-statliga organisationer och andra organisationer och individer som behÃ¶ver\nbroar. Broar som Ã¤r fÃ¶rdelade Ã¶ver mekanismen \"Reserved\" fÃ¥r inte\nse anvÃ¤ndare under lÃ¥ng tid. Observera att \"Reserved\" distributionsmekanismen\nkallas \"Unallocated\" i %sbropooluppdrags%sfiler."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+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 "Broar vars distributionsmekanism Ã¤r \"None\" distribueras inte av BridgeDB.\nDet Ã¤r brooperatÃ¶rens ansvar att distribuera sina broar till\nanvÃ¤ndare. Observera att vid RelÃ¤sÃ¶kning, Ã¤r en nyligen instÃ¤lld bros\ndistributionsmekanismen \"None\" fÃ¶r upp till ungefÃ¤r en dag. Var lite tÃ¥lmodig, och\ndetta kommer dÃ¥ att Ã¤ndras till brons faktiska distributionsmekanism.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
-msgstr "VÃ¤lj alternativ fÃ¶r typ av bro:"
+msgstr "VÃ¤nligen vÃ¤lj alternativ fÃ¶r typ av bro:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "BehÃ¶ver du en IPv6-adress?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BehÃ¶ver du %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Din webblÃ¤sare visar inte bilder korrekt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Skriv in tecknen frÃ¥n bilden ovan..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Hur du bÃ¶rjar anvÃ¤nda dina broar"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "FÃ¶r att ange 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " FÃ¶rst mÃ¥ste du %shÃ¤mta Tor Browser%s. VÃ¥r anvÃ¤ndarmanual fÃ¶r Tor\n Browser fÃ¶rklarar hur du kan lÃ¤gga till dina broar i Tor Browser. Om du anvÃ¤nder\n Windows, Linux, or OS X, %sklicka hÃ¤r%s fÃ¶r att lÃ¤ra dig mer. Om du\n anvÃ¤nder Android, %sklicka hÃ¤r%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "LÃ¤gg till dessa broar i din Tor Browser genom att Ã¶ppna instÃ¤llningarna\ni din webblÃ¤sare, klicka pÃ¥ \"Tor\" och lÃ¤gg sedan till dem i fÃ¤ltet \"Ange en\nbro\"."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Blockerar eller filtrerar din InternetleverantÃ¶r (ISP) anslutningar till Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(BegÃ¤r icke-dolda Tor-broar.)"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "VÃ¤lj 'Ja' och klicka sedan pÃ¥ 'NÃ¤sta'. FÃ¶r att konfigurera nya broar, kopiera och klistra in broraderna i textrutan. Klicka slutligen pÃ¥ 'Anslut' och det borde vara klart fÃ¶r anvÃ¤ndning! Om du fÃ¥r problem, prova att klicka pÃ¥ 'HjÃ¤lp'-knappen i 'Tor Network Settings' fÃ¶r vidare hjÃ¤lp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Visa detta meddelande."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Leta efter vanliga broar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "BegÃ¤r IPv6-broar"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Leta efter en Pluggable Transport av en viss TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(BegÃ¤r IPv6-broar.)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "HÃ¤mta en kopia av BridgeDB:s publika GnuPG-nyckel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(BegÃ¤r obfs4 dolda broar.)"
diff --git a/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..27f77d1
--- /dev/null
+++ b/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Zaituni Njovu <zaituni@xxxxxxxxxxxxxxxxxxxxx>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Samahani!  Kitufulani kimekwenda vibaya pamoja na ombi lako."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Ripoti Bug"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Chanzo msimbo"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Badili log"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Chagua zote"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Onyesha QR msimbo"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR msimbo kwa mistari ya daraja"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Inaonekana kuna kosa katika kupata QR msimbo wako."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Msimbo huu wa QR unanayo mistari ya daraja lako.  Scan msimbo wa QR msomaji kutoa nakala ya daraja lako kwa simu na vifaa vingine."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Huko sasa hakuna madaraja yoyote yanayopatikana..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Labda ujaribu 1%s kurudi 1%s  na uchague aina tofauti ya daraja!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hatua 1%s 1 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pakua 1%s Kivinjari cha Tor 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Pata 1%s madaraja 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Hatua 1%s 3 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "1%s J 1%s ust nipe mimi daraja!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "chaguo la juu"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "hapana"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Hakuna"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "1%s Y 1%s  es!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "1%s G 1%s et Madaraja"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Hapa ndio madaraja yako:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Ni nini madaraja?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "1%s Madaraja 1%s ni Tor relays inakusaidia wewe kukimbia uthibiti."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Nahitaji njia nyingine ya kupata madaraja mbadala!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Hapa ni mistari ya daraja lako:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Pata madaraja!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Hakuna"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "Unahitaji  anuani za IPv6?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Unahitaji 1%s ?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Kivinjari chako hakionyeshi picha vizuri."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Ingiza maneno kutoka kwenye picha juu..."
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Jinsi ya kuanza kutumia madaraja yako"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
index 855f43c..32d94a5 100644
--- a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Anto Sujesh <sujeshantoj@xxxxxxxxx>, 2015
@@ -8,120 +8,136 @@
 # Ephraim Raj <ephraimraj11299@xxxxxxxxx>, 2016
 # git12a <git12@xxxxxxxxxxxxxxx>, 2015
 # Senthil Kumar <paranthaba@xxxxxxxxx>, 2017
+# Stymy RAT, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "à®®à®©à¯?à®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?! à®?à®?à¯?à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®?à¯?à®³à®¿à®±à¯?à®?à¯? à®?à®¤à¯?à®?à®°à¯?  à®¤à®µà®±à¯? à®¨à¯?à®°à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à®®à¯?à®¾à®´à®¿"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "à®?à®°à¯? à®ªà®¿à®´à¯?à®¯à¯? à®?à®±à®¿à®?à¯?à®?à¯?à®?à¯?à®¯à¯?à®?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "à®®à¯?à®² à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "à®®à®¾à®±à¯?à®±à®®à¯?à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¾à®ªà¯?à®ªà¯?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®³à¯?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à®?à®©à¯?à®¤à¯?à®¤à¯?à®¯à¯?à®®à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®¾à®£à¯?à®ªà®¿ "
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®¯ bridge à®µà®°à®¿à®?à®³à¯?à®?à¯?à®?à®¾à®© QRCode"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr " à®?à®¯à®?à¯?, à®ªà®¿à®°à®?à¯?à®?à®©à¯?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à®?à®¨à¯?à®¤ QRCode à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³à®¤à¯?. à®?à¯?à®²à¯?à®²à®¿à®?à®ªà¯?à®?à®¿ à®®à®±à¯?à®±à¯?à®®à¯? à®µà¯?à®±à¯? à®?à®¾à®¤à®©à®?à¯?à®?à®³à®¿à®²à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®¨à®¿à®°à®²à¯?à®?à¯?à®?à¯?à®? QRCode à®µà®¾à®?à®¿à®ªà¯?à®ªà®¾à®©à¯? à®®à¯?à®²à®®à¯? à®?à®¤à¯? à®?à®?à¯?à®±à¯?à®µà®¿ à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "à®¤à®±à¯?à®?à®®à®¯à®®à¯? Bridge-à®?à®³à¯? à®¯à¯?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à®?à®°à¯?à®µà¯?à®³à¯? à®¨à¯?à®?à¯?à®?à®³à¯? %s à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®? à®ªà®¿à®©à¯?à®©à¯? à®?à¯?à®©à¯?à®±à¯? %s à®µà¯?à®±à¯?à®°à¯? à®µà®?à¯? à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?à®¯à®²à®¾à®®à¯?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à®?à®?à®¿ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®µà¯?à®®à¯? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à®?à®?à®¿ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Bridge-à®?à®³à¯? %s à®ªà¯?à®±à¯?à®?"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à®?à®?à®¿ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
@@ -130,27 +146,27 @@ msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà®¨à¯?%sà®°à®¯à®?à®¿à®¯à®¾à®? bridge-à®?à®³à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à®®à¯?à®®à¯?à®ªà®?à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à®?à®²à¯?à®²à¯?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à®?à®¤à¯?à®µà¯?à®®à®¿à®²à¯?à®²à¯?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà®?%sà®®à¯?!"
@@ -158,69 +174,37 @@ msgstr "%sà®?%sà®®à¯?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sà®ªà¯?%sà®°à¯?à®? Bridge-à®?à®³à¯?"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ à®?à®¤à¯? à®?à®°à¯? à®¤à®¾à®©à®¿à®¯à®?à¯?à®?à®¿ à®?à¯?à®¯à¯?à®¤à®¿; à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? à®ªà®¤à®¿à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®µà¯?à®£à¯?à®?à®¾à®®à¯?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridges:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "à®¨à¯?à®?à¯?à®?à®³à¯? à®µà¯?à®¤ à®µà®°à®®à¯?à®ªà¯? à®®à¯?à®±à®¿ à®µà®¿à®?à¯?à®?à¯?à®°à¯?à®?à®³à¯?. à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®¤à¯?à®µà®?à¯?à®¯à®µà¯?à®®à¯?! à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à®¿à®©à¯? à®?à®?à¯?à®¯à¯? à®?à¯?à®±à¯?à®¨à¯?à®¤à®ªà®?à¯?à®? à®¨à¯?à®°à®®à¯? %s à®®à®£à®¿à®?à®³à¯?. à®?à®¨à¯?à®¤ à®¨à¯?à®°à®¤à¯?à®¤à®¿à®©à¯?à®³à¯? à®?à®©à¯?à®¤à¯?à®¤à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯?à®®à¯?  à®¨à®¿à®°à®¾à®?à®°à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®®à¯?."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "à®?à®?à¯?à®?à®³à¯?à®?à®³à¯?: (à®ªà®² à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®? à®?à®?à¯?à®?à®³à¯?à®?à®³à¯? à®?à®°à¯?à®?à®®à®¯à®¤à¯?à®¤à®¿à®²à¯? à®?à®©à¯?à®±à®¿à®¯à®¿à®©à¯?à®?à®µà¯?à®®à¯?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-à®¯à®¿à®©à¯?à®³à¯? à®¨à®²à¯?à®µà®°à®µà¯?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "à®¤à®±à¯?à®ªà¯?à®¾à®¤à¯? à®?à®¤à®°à®µà¯? à®?à®³à¯?à®³ Transport TYPE-à®?à®³à¯? "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "à®¹à¯?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "à®¹à®²à¯?à®¾, à®¤à¯?à®´à®¾!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "à®ªà¯?à®¾à®¤à¯? à®?à®¾à®µà®¿à®?à®³à¯?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "à®?à®¨à¯?à®¤ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®µà®¾à®©à®µà®¿à®²à¯?, à®¯à¯?à®©à®¿à®?à®¾à®°à¯?à®©à¯?à®?à®³à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®?à®¿à®±à¯?à®¤à¯?à®ªà¯?à®ªà¯?à®±à®¿à®?à®³à¯? à®?à¯?à®£à¯?à®?à¯? \n%s -à®?à®¾à®?  %s à®?à®©à¯?à®±à¯? %s à®¨à¯?à®°à®¤à¯?à®¤à®¿à®²à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,7 +215,7 @@ msgid ""
 msgstr "BridgeDB-à®¯à®¾à®²à¯? %sà®ªà®²à®µà®?à¯?à®¯à®¾à®© Pluggable Transports%s bridge-à®?à®³à¯? à®¤à®°à®®à¯?à®?à®¿à®¯à¯?à®®à¯?,\nà®?à®µà¯? à®?à®?à¯?à®?à®³à¯? Tor Network à®?à®£à¯?à®ªà¯?à®ªà¯?à®?à®³à¯? à®µà®¿à®³à®?à¯?à®?à®¾à®¤à®µà®£à¯?à®£à®®à¯? à®?à®?à¯?à®?à®µà¯?à®¤à®µà®¿, à®?à®?à¯?à®?à®³à®¿à®©à¯? \nà®?à®£à¯?à®¯ à®ªà¯?à®¾à®?à¯?à®?à¯?à®µà®°à®¤à¯?à®¤à¯? à®?à®£à¯?à®?à®¾à®©à®¿à®ªà¯?à®ªà®µà®°à¯?à®?à¯?à®?à¯? à®¨à¯?à®?à¯?à®?à®³à¯? Tor à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à¯?à®°à¯?à®?à®³à¯? à®?à®©à®?à¯?à®?à®©à¯?à®?à®±à®¿à®¯ à®®à¯?à®²à¯?à®®à¯?\nà®?à®?à®¿à®©à®®à¯? à®?à®?à¯?à®?à¯?à®®à¯?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -243,7 +227,7 @@ msgstr "à®?à®¿à®² IPv6 à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯?à®£à¯?à®? bridge-à®?à®³à¯?
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -252,134 +236,169 @@ msgid ""
 "\n"
 msgstr "à®?à¯?à®?à¯?à®¤à®²à®¾à®?, BridgeDB-à®¯à®¿à®©à¯?à®³à¯? à®?à®°à®¾à®³à®®à®¾à®© à®ªà®´à¯?à®¯à®®à¯?à®±à¯? bridge-à®?à®³à¯? \n%s Pluggable Transports à®µà®?à®¤à®¿à®¯à®¿à®²à¯?à®²à®¾à®®à®²à¯? à®?à®³à¯?à®³à®¤à¯? %s à®?à®£à®°à¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®?à¯?à®?à®¿à®±à®µà®¾à®±à¯? à®?à®²à¯?à®²à®¾à®µà®¿à®?à¯?à®?à®¾à®²à¯?à®®à¯?, \nà®?à®µà¯?à®¯à®¾à®²à¯? à®ªà®² à®?à®¨à¯?à®¤à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à®¿à®²à¯? à®?à®©à¯?à®¯ à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à¯? à®?à®?à®?à¯?à®? à®?à®¤à®µà¯?à®®à¯?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Bridges à®?à®©à¯?à®±à®¾à®²à¯? à®?à®©à¯?à®©?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridge-à®?à®³à¯? %s à®?à®©à¯?à®®à¯? Tor Relay-à®?à®³à¯? à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à¯? à®?à®?à®?à¯?à®?  à®?à®¤à®µà¯?à®®à¯?"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "à®?à®©à®?à¯?à®?à¯? Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®°à¯? à®®à®¾à®±à¯?à®±à¯? à®µà®´à®¿ à®µà¯?à®£à¯?à®?à¯?à®®à¯?"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®°à¯? à®®à®¾à®±à¯?à®±à¯?à®µà®´à®¿ %s à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯?   à®?à®°à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯?.\nà®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¯à®¤à¯? à®?à®µà®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à®?à¯?à®?à®¾à®¯à®®à®¾à®? à®?à¯?à®´à¯?à®?à®£à¯?à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®µà¯?à®?à®³à®¿à®©à¯? à®®à¯?à®?à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯? :\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "à®?à®©à¯? Bridge-à®?à®³à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯?! à®?à®©à®?à¯?à®?à¯? à®?à®¤à®µà®¿ à®¤à¯?à®µà¯?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à®?à®?à¯?à®?à®³à¯? Tor à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯? à®?à®©à®¿à®²à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? %s à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à¯?à®³à¯?à®?  "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à®?à®?à¯?à®?à®³à¯? à®µà®´à®?à¯?à®?à¯? à®?à¯?à®±à®¿à®¤à¯?à®¤à¯? à®?à®¤à®¿à®?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à®³à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®³à¯?, à®?à®¤à®¿à®²à¯? à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®¯à®±à¯?à®?à®¿à®¤à¯?à®¤ bridges\nà®®à®±à¯?à®±à¯?à®®à¯? Pluggable Transports, à®¤à®?à¯?à®?à®³à®¿à®©à¯? Tor Browser à®ªà®¤à®¿à®ªà¯?à®ªà¯? à®?à®£à¯? à®?à®?à®¿à®¯à®µà¯? à®?à®?à®?à¯?à®?à¯?à®®à¯?, à®®à®±à¯?à®±à¯?à®®à¯? Tor\nà®?à¯?à®°à®¿à®¯à®¤à®?à®µà®²à¯?à®?à®³à¯? à®ªà¯?à®¾à®©à¯?à®±à®µà®±à¯?à®±à¯?à®¯à¯?à®®à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®¯ Tor Browser à®?à®²à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?à®¯à¯?à®©à®¿à®²à¯?, à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? %sà®¯à¯?à®®à¯? à®¨à®®à®¤à¯? %sà®¯à¯?à®®à¯? à®?à®¾à®£à¯?à®?."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à¯?à®?à®³à¯?: "
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "à®¯à®¾à®°à¯?à®®à¯?"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Bridge à®µà®?à¯? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? IPv6 à®®à¯?à®?à®µà®°à®¿à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®®à®¾?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®°à¯? %s à®¤à¯?à®µà¯?à®¯à®¾?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr " à®¤à®?à¯?à®?à®³à®¿à®©à¯? browser à®ªà®?à®?à¯?à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®? à®?à®¾à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "à®®à¯?à®²à¯? à®?à®³à¯?à®³ à®ªà®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®°à¯?à®?à¯?à®?à¯?à®®à¯? à®?à®´à¯?à®¤à¯?à®¤à¯?à®?à¯?à®?à®³à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "à®¤à®?à¯?à®?à®³à®¿à®©à¯? bridge-à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®¤à¯?à®¾à®?à®?à¯?à®?à¯?à®µà®¤à¯? à®?à®ªà¯?à®ªà®?à®¿"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor à®?à®²à®¾à®µà®¿à®¯à®¿à®²à¯? bridgeà®?à®³à¯? à®?à®³à¯?à®³à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯, à®®à¯?à®¤à®²à®¿à®²à¯? %s Tor à®?à®²à®¾à®µà®¿ à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à¯? à®?à¯?à®©à¯?à®±à¯? %s à®®à¯?à®²à¯?à®®à¯? à®ªà®¿à®±à®?à¯? à®?à®?à¯?à®?à¯? Tor à®?à®²à®¾à®µà®¿à®¯à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®¤à¯?à®?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®?à®±à®¿à®µà¯?à®±à¯?à®¤à¯?à®¤à®²à¯?à®?à®³à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à¯?à®?à¯?à®?à®³à¯?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' à®?à®°à¯?à®¯à®¾à®?à®²à¯? à®®à¯?à®²à¯?à®¤à¯?à®¾à®©à¯?à®±à¯?à®®à¯? à®ªà¯?à®´à¯?à®¤à¯?, 'à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯?à®?à¯?à®¯à¯?à®¤à¯? \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®?à®¤à¯? à®?à¯?à®?à¯?à®?à¯?à®®à¯?à®µà®°à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à®µà¯?à®®à¯?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "à®?à®?à¯?à®?à®³à®¿à®©à¯? à®?à®£à¯?à®¯ à®?à¯?à®µà¯? à®µà®´à®?à¯?à®?à¯?à®®à¯? (ISP) à®¨à®¿à®±à¯?à®µà®©à®®à¯? Tor à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®¤à®?à¯?à®?à¯?à®?à®¿à®±à®¤à®¾ à®?à®²à¯?à®²à®¤à¯? \nà®µà¯?à®±à¯?à®µà®´à®¿à®¯à®¿à®²à¯? à®¤à®£à®¿à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à®¾? "
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'à®?à®®à¯?' à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®¤à¯?à®¤à¯? à®ªà®¿à®©à¯?à®©à®°à¯? 'à®?à®?à¯?à®¤à¯?à®¤à¯?' à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®¤à®?à¯?à®?à®³à®¿à®©à¯? à®ªà¯?à®¤à®¿à®¯ bridge-à®?à®³à¯? à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?, \nà®µà®°à®¿à®?à¯?à®?à®³à¯? à®µà®¾à®?à¯?à®?à®¿à®¯à®®à¯? à®?à®³à¯?à®³à¯?tà®?à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¨à®?à®²à¯?à®?à®?à¯?à®¤à¯?à®¤à¯?  à®ªà¯?à®¸à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®?à®±à¯?à®¤à®¿à®¯à®¾à®?, 'à®?à®£à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯? \nà®?à¯?à®¯à¯?à®¤à®µà¯?à®?à®©à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à¯?à®²à¯?à®² à®¤à®¯à®¾à®°à¯?! à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¿à®°à®?à¯?à®?à®¿à®©à¯?à®¯à¯? à®?à®¨à¯?à®¤à®¿à®¤à¯?à®¤à®¾à®²à¯?, 'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ 'à®?à®¤à®µà®¿' à®ªà¯?à®¾à®¤à¯?à®¤à®¾à®©à¯?  à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®²à¯?à®®à¯? à®?à®¤à®µà®¿ à®ªà¯?à®±à®µà¯?à®®à¯?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®¾à®?à¯?à®?à®µà¯?à®®à¯? "
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "à®ªà®´à¯?à®¯à®®à¯?à®±à¯?à®¯à®¾à®© bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pluggable Transport bridge-à®?à®³à¯? TYPE à®µà®?à¯?à®¯à®¿à®²à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr " BridgeDB-à®¯à¯?à®?à¯?à®¯ à®ªà¯?à®¾à®¤à¯? GnuPG à®?à®¾à®µà®¿à®¯à®¿à®©à¯? à®?à®°à¯? à®¨à®?à®²à¯? à®ªà¯?à®±à®µà¯?à®®à¯?."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
index a8b6727..418410f 100644
--- a/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,409 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
-# AomNicha <vainilla7@xxxxxxxxx>, 2013
+# bact' <arthit@xxxxxxxxx>, 2017
+# bact' <arthit@xxxxxxxxx>, 2017,2020
+# BlackDog ForThai <myblackdog@xxxxxxx>, 2015
+# DN DN <deen6@xxxxxxxxxxxxxx>, 2019
+# Ella Rudland <atwwtkp@xxxxxxxxx>, 2015
+# exploiz, 2014
+# exploiz, 2014
+# kanesayan gwangsai <thailand.1.2009.00067.77.9@xxxxxxxxx>, 2016
+# lanichita <vainilla7@xxxxxxxxx>, 2013
+# Nipattra Chaiprakobwiriya <patt.nipattra@xxxxxxxxx>, 2019
+# lanichita <vainilla7@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-27 08:50+0000\n"
-"Last-Translator: AomNicha <vainilla7@xxxxxxxxx>\n"
-"Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "à¸ªà¸°à¸?à¸²à¸?à¸«à¸¡à¸²à¸¢à¸?à¸¶à¸?à¸à¸°à¹?à¸£"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à¸?à¸à¸à¸ à¸±à¸¢! à¸¡à¸µà¸à¸°à¹?à¸£à¸?à¸´à¸?à¸?à¸?à¸?à¸´à¹?à¸?à¸´à¸?à¸?à¸¶à¹?à¸?à¸?à¸±à¸?à¸?à¸³à¸?à¸à¸?à¸à¸?à¸?à¸¸à¸?"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¸ à¸²à¸©à¸²"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "à¹?à¸?à¹?à¸?à¸?à¸±à¹?à¸?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "à¸?à¸à¸£à¹?à¸ªà¹?à¸?à¹?à¸?"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "à¸?à¸¹à¸¡à¸?à¸§à¸²à¸¡à¹?à¸?à¸¥à¸µà¹?à¸¢à¸?à¹?à¸?à¸¥à¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¹?à¸?à¸«à¸¡à¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "à¹?à¸ªà¸?à¸?à¸£à¸«à¸±à¸ª QR"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "à¸£à¸«à¸±à¸ª QR à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "à¹?à¸«à¸¡à¸·à¸à¸?à¸?à¸°à¸¡à¸µà¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸£à¸°à¸«à¸§à¹?à¸²à¸?à¸£à¸±à¸?à¸£à¸«à¸±à¸ª QR à¸?à¸à¸?à¸?à¸¸à¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à¸£à¸«à¸±à¸ª QR à¸?à¸µà¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¥à¸?à¸ºà¸ªà¹?à¸?à¹?à¸²à¸? à¸ªà¹?à¸?à¸?à¸?à¹?à¸§à¸¢à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸à¹?à¸²à¸?à¸£à¸«à¸±à¸ª QR à¹?à¸?à¸·à¹?à¸à¸?à¸µà¹?à¸?à¸°à¸?à¸³à¸ªà¸³à¹?à¸?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¥à¸?à¸ºà¸ªà¹?à¸?à¹?à¸²à¸? à¹?à¸?à¸?à¸¶à¸?à¹?à¸¡à¸?à¸²à¸¢à¹?à¸¥à¸°à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸à¸·à¹?à¸?à¹?"
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "à¸?à¸±à¸?à¸?à¸¸à¸?à¸±à¸?à¸?à¸µà¹?à¹?à¸¡à¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸µà¹?à¹?à¸?à¹?à¹?à¸?à¹?"
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à¸?à¹?à¸²à¸?à¸?à¸§à¸£à¸?à¸°à¸¥à¸à¸?à¸?à¸¹ %s à¸?à¸¥à¸±à¸? %s à¹?à¸¥à¸·à¸à¸?à¸?à¸£à¸°à¹?à¸ à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¡à¹?à¹?à¸«à¸¡à¸·à¸à¸?à¹?à¸?à¸´à¸¡à¸à¸²à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¹?"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à¸¥à¸³à¸?à¸±à¸?%s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸? %s Tor Browser %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à¸¥à¸³à¸?à¸±à¸?%s2%s"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
+msgid "Get %s bridges %s"
+msgstr "à¹?à¸à¸² %s à¸?à¸£à¸´à¸?à¸?à¹? à¸¡à¸² %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "à¸¥à¸³à¸?à¸±à¸?%s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "à¸?à¸à¸?à¸?à¸µà¹? %s à¹?à¸?à¸´à¹?à¸¡à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸? Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¹?à¸?à¸ªà¸¹à¸?"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "à¹?à¸¡à¹?"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "à¹?à¸?à¸¥à¹?à¸²"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sà¹?à¸?à¹?%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¸ºà¸¡à¸²"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¹?à¸²à¸?"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "à¸?à¸¸à¸?à¸ªà¹?à¸?à¸?à¸µà¹?à¹?à¸?à¸´à¸?à¸?à¸³à¸«à¸?à¸? à¹?à¸?à¹?à¸¢à¹?à¸?à¹? à¹?à¸§à¸¥à¸²à¸£à¸°à¸«à¸§à¹?à¸²à¸?à¸à¸µà¹?à¸¡à¸¥à¸ªà¸à¸?à¸?à¸¸à¸?à¸?à¸·à¸à¸à¸¢à¹?à¸²à¸?à¸?à¹?à¸à¸¢ %s à¸?à¸±à¹?à¸§à¹?à¸¡à¸?\nà¸à¸µà¹?à¸¡à¸¥à¸à¸·à¹?à¸?à¹?à¸?à¸?à¸µà¹?à¸ªà¹?à¸?à¹?à¸?à¸£à¸°à¸«à¸§à¹?à¸²à¸?à¹?à¸§à¸¥à¸²à¸?à¸µà¹?à¸?à¸°à¸?à¸¹à¸?à¹?à¸?à¸´à¸?à¹?à¸?à¸¢"
+
+#: bridgedb/strings.py:40
 msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s à¸ªà¸°à¸?à¸²à¸?à¸£à¸µà¹?à¸¥à¸¢à¹? %s  à¸?à¸·à¸ Tor à¸£à¸µà¹?à¸¥à¸¢à¹? à¸?à¸µà¹?à¸?à¹?à¸§à¸¢à¹?à¸«à¹?à¸?à¸¸à¸?à¸ªà¸²à¸¡à¸²à¸£à¸«à¸¥à¸µà¸?à¸«à¸?à¸µà¸?à¸²à¸£à¸?à¸£à¸§à¸?à¸ªà¸à¸?"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
-#: lib/bridgedb/templates/base.html:39
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸±à¸?à¸«à¸²à¹?à¸«à¹?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸¶à¹?à¸?à¸¡à¸µ %s Pluggable Transports à¸?à¹?à¸²à¸?à¸?à¸?à¸´à¸?à¹?à¸?à¹?%s,\nà¸?à¸¶à¹?à¸?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¹?à¸§à¸¢à¸?à¸³à¹?à¸«à¹?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸? à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor à¹?à¸?à¹?à¸?à¸¢à¸¸à¹?à¸?à¹?à¸«à¸¢à¸´à¸?, à¸?à¸¶à¹?à¸?à¸?à¸°à¸?à¸³à¹?à¸«à¹?\nà¸¥à¸³à¸?à¸²à¸?à¸¡à¸²à¸?à¸?à¸§à¹?à¸²à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸¸à¸?à¸?à¸¥à¸?à¸³à¸¥à¸±à¸?à¸¡à¸à¸?à¹?à¸«à¹?à¸?à¸?à¸²à¸£à¸?à¸´à¸?à¸?à¹?à¸à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¸·à¹?à¸à¸?à¸?à¸§à¹?à¸²à¸?à¸¸à¸?\nà¸?à¸³à¸¥à¸±à¸?à¹?à¸?à¹? Tor.\n\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¸ºà¸?à¸²à¸?à¸à¸±à¸?à¸?à¸µà¹?à¸¡à¸µà¸«à¸¡à¸²à¸¢à¹?à¸¥à¸? IPv6 à¸?à¹?à¸§à¸¢ à¹?à¸¡à¹?à¸§à¹?à¸² Pluggable\nTransports à¸?à¸²à¸?à¸ªà¹?à¸§à¸?à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸³à¸?à¸²à¸?à¸£à¹?à¸§à¸¡à¸?à¸±à¸? IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "à¸¢à¸´à¹?à¸?à¸?à¸§à¹?à¸²à¸?à¸±à¹?à¸? BridgeDB à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¸ºà¸¡à¸²à¸?à¸£à¸?à¸²à¸? %s à¹?à¸?à¸¢à¹?à¸¡à¹?à¸¡à¸µ\nPluggable Transports %s\nà¸?à¸µà¹?à¸?à¹?à¸§à¸¢à¸«à¸¥à¸µà¸?à¹?à¸¥à¸µà¹?à¸¢à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸ªà¸?à¸²à¸?à¸?à¸²à¸£à¸?à¹?à¸ªà¹?à¸§à¸?à¸¡à¸²à¸?\n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸·à¸à¸à¸°à¹?à¸£?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s à¸?à¸£à¸´à¸?à¸?à¹? %s à¸?à¸·à¸ Tor à¸£à¸µà¹?à¸¥à¸¢à¹?à¸?à¸µà¹?à¸?à¹?à¸§à¸¢à¹?à¸«à¹?à¸?à¸¸à¸?à¸«à¸¥à¸µà¸?à¹?à¸¥à¸µà¹?à¸¢à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?."
+
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr "à¸?à¸±à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸²à¸?à¹?à¸¥à¸·à¸à¸?à¸à¸·à¹?à¸?à¹?à¸?à¸·à¹?à¸à¹?à¸?à¹?à¸²à¸?à¸¶à¸?à¸ªà¸°à¸?à¸²à¸?"
+msgstr "à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸²à¸?à¹?à¸¥à¸·à¸à¸?à¹?à¸?à¸·à¹?à¸à¹?à¸?à¹?à¸?à¸£à¸´à¸?à¸?à¹?"
 
-#: lib/bridgedb/templates/base.html:40
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "à¸à¸µà¸?à¸«à¸?à¸¶à¹?à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸? à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¹?à¸?à¸«à¸²à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?à¸ªà¸°à¸?à¸²à¸?à¸ªà¸²à¸?à¸²à¸£à¸?à¸° à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸³à¹?à¸?à¹?à¸?à¹?à¸²à¸?à¸?à¸²à¸£à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥ (à¸?à¸²à¸? %s à¸«à¸£à¸·à¸ à¸?à¸µà¹?à¸à¸¢à¸¹à¹? %s) à¹?à¸?à¸ªà¸¹à¹? %s à¸?à¹?à¸§à¸¢à¹?à¸ªà¹?à¸?à¸?à¸²à¸? \"\n\"à¸?à¸²à¸£à¹?à¸?à¹?à¸²à¸?à¸¶à¸?à¸ªà¸°à¸?à¸²à¸?\" à¸ à¸²à¸¢à¹?à¸?à¹?à¸?à¸·à¹?à¸à¸«à¸²à¸?à¸à¸?à¸à¸µà¹?à¸¡à¸¥"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "à¸à¸µà¸?à¸§à¸´à¸?à¸µà¸?à¸µà¹?à¸?à¸°à¸?à¸£à¸²à¸?à¸£à¸²à¸¢à¸?à¸·à¹?à¸à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸·à¸ à¹?à¸«à¹?à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥à¹?à¸?à¸?à¸µà¹? %s à¹?à¸?à¸¢à¹?à¸§à¹?à¸?à¸§à¹?à¸²à¸?à¸«à¸±à¸§à¸?à¹?à¸ (subject)\nà¸?à¸à¸?à¸à¸µà¹?à¸¡à¸¥à¹?à¸§à¹? à¹?à¸¥à¸°à¹?à¸?à¸?à¸±à¸§à¸?à¸?à¸«à¸¡à¸²à¸¢à¹?à¸«à¹?à¹?à¸?à¸µà¸¢à¸?à¸§à¹?à¸² \"get transport obfs4\" à¹?à¸?à¸£à¸?à¸?à¸£à¸²à¸?à¸?à¹?à¸§à¸¢à¸§à¹?à¸²\nà¸?à¸¸à¸?à¸?à¸°à¸?à¹?à¸à¸?à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥à¹?à¸?à¸¢à¹?à¸?à¹?à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸à¸µà¹?à¸¡à¸¥à¸?à¸²à¸?à¸«à¸?à¸¶à¹?à¸?à¹?à¸?à¸?à¸¹à¹?à¹?à¸«à¹?à¸?à¸£à¸´à¸?à¸²à¸£à¸à¸µà¹?à¸¡à¸¥à¸?à¸±à¸?à¸?à¹?à¸à¹?à¸?à¸?à¸µà¹?:\n%s à¸«à¸£à¸·à¸ %s"
 
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
-msgstr "à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸§à¸²à¸¡à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸ à¸ªà¸°à¸?à¸²à¸?à¹?à¸¡à¹?à¸?à¸³à¸?à¸²à¸?"
+msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¡à¹?à¸?à¸³à¸?à¸²à¸? à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸§à¸²à¸¡à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸ "
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
 #, python-format
 msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "à¸?à¹?à¸² Tor à¹?à¸¡à¹?à¸?à¸³à¸?à¸²à¸? à¹?à¸«à¹?à¸?à¸¸à¸?à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥ %s à¸?à¸£à¹?à¸à¸¡à¹?à¸?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?à¸µà¹?à¸¢à¸§à¸?à¸±à¸?à¸ªà¸?à¸²à¸?à¸?à¸²à¸£à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸? à¸£à¸²à¸¢à¸?à¸·à¹?à¸à¸?à¸à¸?à¸ªà¸°à¸?à¸²à¸?à¸?à¸µà¹?à¸?à¸¸à¸?à¹?à¸?à¸¢à¹?à¸?à¹? à¸?à¸±à¸?à¸?à¸µà¸£à¸²à¸¢à¸?à¸·à¹?à¸à¸«à¸£à¸·à¸à¹?à¸§à¸à¸£à¹?à¸?à¸±à¹?à¸?à¸?à¸µà¹?à¸?à¸¸à¸?à¹?à¸?à¸¢à¹?à¸?à¹? à¸?à¹?à¸à¸?à¸§à¸²à¸¡à¸?à¸µà¹? Tor à¸ªà¹?à¸?à¸?à¸¶à¸?à¸?à¸¸à¸? à¹?à¸¥à¸°à¸à¸·à¹?à¸?à¹? à¸?à¸µà¹?à¸?à¸³à¹?à¸?à¹?à¸?"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "à¸«à¸²à¸? Tor Browser à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¹? à¸?à¸£à¸¸à¸?à¸²à¸?à¸£à¸§à¸?à¸ªà¸à¸?à¸?à¸µà¹? %s à¹?à¸¥à¸°à¸?à¸µà¹? %s"
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¸?à¸µà¹?à¸?à¸µà¹?:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "à¸£à¸±à¸?à¸?à¸£à¸´à¸?à¸?à¹?"
 
-#: lib/bridgedb/templates/bridges.html:10
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr " à¹?à¸?à¸·à¹?à¸à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¸²à¸¡à¸?à¸³à¹?à¸?à¸°à¸?à¸³à¸?à¹?à¸²à¸?à¸?à¸? à¹?à¸?à¸?à¸µà¹?à¸?à¸²à¸£à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Vidalia à¸?à¸²à¸?à¸?à¸±à¹?à¸?à¸?à¸¥à¸´à¸?à¸?à¸µà¹? \"à¹?à¸à¹?à¸à¸ªà¸?à¸µà¸?à¸à¸?à¸?à¸±à¸?à¸?à¸¹à¸?à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¹?à¸¡à¹?à¹?à¸«à¹?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¸?à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢\" Tor  à¹?à¸¥à¸°à¸?à¸?à¹?à¸?à¸´à¹?à¸¡à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?à¸ªà¸°à¸?à¸²à¸?à¹?à¸?à¹?à¸¥à¸°à¸à¸±à¸?à¸¥à¸?à¹?à¸?"
+"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 ""
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "à¹?à¸¡à¹?à¸¡à¸µà¸ªà¸°à¸?à¸²à¸?à¸?à¸µà¹?à¹?à¸?à¹?à¸?à¸²à¸?à¹?à¸?à¹?à¹?à¸?à¸?à¸?à¸°à¸?à¸µà¹?"
+#: bridgedb/strings.py:115
+#, 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 ""
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "à¸?à¹?à¸§à¸¢à¸?à¸£à¸±à¸?à¸£à¸¸à¹?à¸?à¹?à¸?à¸£à¸²à¸§à¹?à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸¥à¹?à¸?à¹?à¸à¸?"
+#: bridgedb/strings.py:119
+#, 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 ""
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "à¹?à¸«à¹?à¸?à¸´à¸¡à¸?à¹?à¸?à¸³à¸ªà¸à¸?à¸?à¸³"
+#: bridgedb/strings.py:125
+#, 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 ""
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "à¸?à¸±à¹?à¸?à¸?à¸à¸?à¸?à¸µà¹? 1"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:130
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "à¹?à¸?à¹? %s Tor Browser Bundle %s"
+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:137
+msgid "None"
+msgstr "à¹?à¸¡à¹?à¸¡à¸µ"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr "à¸?à¸£à¸¸à¸?à¸²à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸?à¸´à¸?à¸?à¸à¸?à¸?à¸£à¸´à¸?à¸?à¹?:"
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "à¸?à¸±à¹?à¸?à¸?à¸à¸?à¸?à¸µà¹? 2"
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸µà¹?à¸à¸¢à¸¹à¹? IPv6?"
 
-#: lib/bridgedb/templates/index.html:15
+#: bridgedb/strings.py:150
 #, python-format
-msgid "Get %s bridges %s"
-msgstr "à¹?à¸?à¹? %s à¸ªà¸°à¸?à¸²à¸? %s"
+msgid "Do you need a %s?"
+msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£ %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "à¸?à¸£à¸²à¸§à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸ªà¸?à¸?à¸?à¸¥à¸à¸¢à¹?à¸²à¸?à¸?à¸µà¹?à¸?à¸§à¸£"
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "à¸?à¸´à¸¡à¸?à¹?à¸?à¸±à¸§à¸à¸±à¸?à¸©à¸£à¸?à¸²à¸?à¸ à¸²à¸?à¸?à¹?à¸²à¸?à¸?à¸?..."
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "à¸?à¸±à¹?à¸?à¸?à¸à¸?à¸?à¸µà¹? 3"
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¹?à¸à¸¢à¹?à¸²à¸?à¹?à¸£"
 
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "à¸?à¸?à¸°à¸?à¸µà¹? %s à¹?à¸?à¹?à¹?à¸?à¸´à¹?à¸¡à¸ªà¸°à¸?à¸²à¸?à¹?à¸?à¸?à¸µà¹? Tor %s à¹?à¸¥à¹?à¸§"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
index 0dd1a08..7303776 100644
--- a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
@@ -1,23 +1,24 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Bullgeschichte <bullgeschichte@xxxxxxxxxx>, 2015
 # eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
-# Emir SarÄ± <bitigchi@xxxxxxxxxxxxxxx>, 2014
+# Emir SarÄ± <bitigchi@xxxxxx>, 2014
 # Emre <conan@xxxxxxxxxxxxx>, 2013
 # erg26 <ergungorler@xxxxxxxxx>, 2012
 # erg26 <ergungorler@xxxxxxxxx>, 2012
 # eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
 # Fomas <fomas.adana@xxxxxxxxx>, 2015
 # Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
-# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015-2016,2018-2019
+# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015-2016,2018-2020
 # Ozancan KarataÅ? <ozancankaratas96@xxxxxxxxxxx>, 2015
 # ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
 # Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
 # Sercan AltundaÅ? <>, 2012
 # ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
+# T. E. Kalayci <tekrei@xxxxxxxxx>, 2020
 # Tekel Bira <psycookie@xxxxxxxxx>, 2012
 # Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2016
 # zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
@@ -26,116 +27,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-09 02:36+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 00:11+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Bir Hata Bildirin"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Kaynak Kodu"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "SÃ¼rÃ¼m NotlarÄ±"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ä°letiÅ?im"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "TÃ¼mÃ¼nÃ¼ SeÃ§"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Kodunu GÃ¶rÃ¼ntÃ¼le"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Haydi hayÄ±rlÄ±sÄ±!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR Kodunuzun alÄ±nmasÄ±nda bir sorun Ã§Ä±kmÄ±Å? gibi gÃ¶rÃ¼nÃ¼yor."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Bu QR Kodunda kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z bulunuyor. KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ± bir mobil aygÄ±ta ya da baÅ?ka aygÄ±tlara kopyalamak iÃ§in bu kodu bir QR Kodu tarayÄ±cÄ±sÄ±na okutun."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ile ilgili bir sorun Ã§Ä±ktÄ±."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Å?u anda kullanÄ±labilecek bir kÃ¶prÃ¼ yok..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Belki %s geri dÃ¶nmeyi %s ve farklÄ± bir kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§meyi denemelisiniz!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser UygulamasÄ±nÄ± %s indirin"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶prÃ¼leri %s edinin"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
@@ -144,27 +160,27 @@ msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sana sadece kÃ¶prÃ¼leri verin!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "GeliÅ?miÅ? Ayarlar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "HayÄ±r"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
-msgstr "hiÃ§biri"
+msgstr "yok"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sE%svet!"
@@ -172,69 +188,37 @@ msgstr "%sE%svet!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶prÃ¼leri Al"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu otomatik bir iletidir; lÃ¼tfen yanÄ±tlamayÄ±n.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Bu otomatik bir e-postadÄ±r.]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ä°Å?te kÃ¶prÃ¼leriniz:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "E-posta sÄ±nÄ±rÄ±nÄ±zÄ± aÅ?tÄ±nÄ±z. LÃ¼tfen yavaÅ?layÄ±n! E-postalar arasÄ±ndaki en az zaman %s saattir.\nBu sÃ¼re iÃ§inde gÃ¶ndereceÄ?iniz diÄ?er e-postalarÄ±nÄ±z gÃ¶zardÄ± edilecektir."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMUTlar: (birden fazla seÃ§eneÄ?Ä± aynÄ± anda belirtmek iÃ§in KOMUTlarÄ± birleÅ?tirin)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB'ye HoÅ? Geldiniz!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Å?u an desteklenen aktarÄ±m TÃ?Rleri:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Selam, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Selam, arkadaÅ?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Herkese AÃ§Ä±k Anahtarlar"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Bu e-posta %s iÃ§in %s %s tarihinde gÃ¶kkuÅ?aklarÄ±, tek boynuzlu atlar\nve Ä±Å?Ä±ltÄ±larla oluÅ?turuldu."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ä°stedikleriniz bu kÃ¶prÃ¼ler deÄ?ilse, ileti gÃ¶vdesine Å?u komutlardan \nbirini yazarak bu e-postayÄ± yanÄ±tlayÄ±n:"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,7 +229,7 @@ msgid ""
 msgstr "BridgeDB, Ã§eÅ?itli %stÃ¼rde DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar%s iÃ§eren kÃ¶prÃ¼ler saÄ?layabilir.\nBÃ¶ylece Tor AÄ?Ä± Ã¼zerine yaptÄ±Ä?Ä±nÄ±z baÄ?lantÄ±lar karÄ±Å?tÄ±rÄ±larak, Ä°nternet trafiÄ?inizi\nizleyen birinin Tor kullandÄ±Ä?Ä±nÄ±zÄ± anlamasÄ± zorlaÅ?tÄ±rÄ±labilir.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -257,7 +241,7 @@ msgstr "IPv6 kullanan bazÄ± kÃ¶prÃ¼ler olmasÄ±na raÄ?men bazÄ± DeÄ?iÅ?tirilebili
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -266,134 +250,169 @@ msgid ""
 "\n"
 msgstr "AyrÄ±ca BridgeDB %s Ã¼zerinde herhangi bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± kullanmayan %s birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz vanilla kÃ¶prÃ¼sÃ¼ bulunur. KulaÄ?a pek iyi gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Ä°nternet engellemelerini aÅ?makta yardÄ±mcÄ± olabilir.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "KÃ¶prÃ¼ nedir?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s KÃ¶prÃ¼ler %s Ä°nternet kÄ±sÄ±tlamalarÄ±nÄ± aÅ?manÄ±za yardÄ±mcÄ± olan Tor aktarÄ±cÄ±larÄ±dÄ±r."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "KÃ¶prÃ¼leri edinmek iÃ§in baÅ?ka bir yola gerek duyuyorum!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "KÃ¶prÃ¼leri edinmenin diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±larÄ±n birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s, %s ya da %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "KÃ¶prÃ¼leri almanÄ±n diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir. E-posta\nkonusunu boÅ? bÄ±rakÄ±p ileti iÃ§eriÄ?i olarak \"get transport obfs4\" yazÄ±n. LÃ¼tfen e-postanÄ±n \naÅ?aÄ?Ä±daki e-posta hizmeti saÄ?layÄ±cÄ±larÄ±n birinden alÄ±nmÄ±Å? bir adresten gÃ¶nderilmesi \ngerektiÄ?ini unutmayÄ±n: %s ya da %s."
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "KÃ¶prÃ¼lerim Ã§alÄ±Å?mÄ±yor! YardÄ±m gerek!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor uygulamanÄ±z Ã§alÄ±Å?mÄ±yorsa %s adresine e-posta gÃ¶ndermelisiniz."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkÄ±nda olabildiÄ?ince fazla bilgi verin.\nKullanmaya Ã§alÄ±Å?tÄ±Ä?Ä±nÄ±z kÃ¶prÃ¼ listesi ve DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar, Tor Browser sÃ¼rÃ¼mÃ¼nÃ¼z,\nTor tarafÄ±ndan gÃ¶rÃ¼ntÃ¼lenen tÃ¼m iletiler gibi."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Tor Browser baÄ?lantÄ± kuramÄ±yorsa lÃ¼tfen %s ve %s bÃ¶lÃ¼mlerine bakÄ±n."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ä°Å?te kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "KÃ¶prÃ¼leri Al!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "KÃ¶prÃ¼ daÄ?Ä±tma yÃ¶ntemleri"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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 kÃ¶prÃ¼leri Å?u dÃ¶rt farklÄ± yÃ¶ntemle daÄ?Ä±tÄ±r: \"HTTPS\", \"Moat\",\n\"E-posta\" ve \"AyrÄ±lmÄ±Å?\". BridgeDB Ã¼zerinden daÄ?Ä±tÄ±lmayan kÃ¶prÃ¼ler iÃ§in sÃ¶zde bir\nyÃ¶ntem olan \"Yok\" kullanÄ±lÄ±r. AÅ?aÄ?Ä±daki listede bu yÃ¶ntemlerin nasÄ±l Ã§alÄ±Å?tÄ±Ä?Ä±nÄ± \nve her bir yÃ¶ntemin ne sÄ±klÄ±kta kullanÄ±ldÄ±Ä?Ä±nÄ± gÃ¶rebileceÄ?iniz \n%sBridgeDB istatistikleri%s bulunuyor."
+
+#: bridgedb/strings.py:115
+#, 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 "\"HTTPS\" daÄ?Ä±tÄ±m yÃ¶ntemi kÃ¶prÃ¼leri bu web sitesi Ã¼zerinden daÄ?Ä±tÄ±r. KÃ¶prÃ¼leri\nedinmek iÃ§in %sbridges.torproject.org%s adresine gidin, yeÄ?lediÄ?iniz seÃ§enekleri seÃ§in ve\ngÃ¼venlik kodunu Ã§Ã¶zÃ¼n."
+
+#: bridgedb/strings.py:119
+#, 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 "\"Moat\" daÄ?Ä±tÄ±m yÃ¶ntemi Tor Browser iÃ§inde bulunur ve kullanÄ±cÄ±larÄ±n Tor Browser \nayarlarÄ± bÃ¶lÃ¼mÃ¼nden kÃ¶prÃ¼ isteÄ?inde bulunmalarÄ±nÄ± saÄ?lar. KÃ¶prÃ¼leri edinmek iÃ§in\nTor Browser %sTor ayarlarÄ±%s bÃ¶lÃ¼mÃ¼ne giderek, \"Yeni KÃ¶prÃ¼ Ä°steÄ?inde Bulun\" \nÃ¼zerinde tÄ±klayÄ±n ve gÃ¼venlik kodunu Ã§Ã¶zÃ¼n. Tor Browser yeni kÃ¶prÃ¼leri \notomatik olarak ekler."
+
+#: bridgedb/strings.py:125
+#, 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 "\"E-posta\" daÄ?Ä±tÄ±m yÃ¶nteminde kullanÄ±cÄ±lar %sbridges@xxxxxxxxxxxxxx%s\nadresine gÃ¶nderecekleri bir iletinin iÃ§eriÄ?ine \"get transport obfs4\" yazarak\nkÃ¶prÃ¼ isteÄ?inde bulunabilir."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "AyrÄ±lmÄ±Å?"
+
+#: bridgedb/strings.py:130
+#, 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 otomatik olarak daÄ?Ä±tÄ±lmayan az sayÄ±da kÃ¶prÃ¼ iÃ§in bir liste tutar. \nBu kÃ¶prÃ¼leri otomatik olarak daÄ?Ä±tmak yerine el ile daÄ?Ä±tmak iÃ§in ayÄ±rdÄ±k.\nBunlarÄ± kÃ¶prÃ¼ gereksinimi olan STK gibi kuruluÅ?lara ve bireylere veriyoruz.\n\"AyrÄ±lmÄ±Å?\" yÃ¶ntem ile daÄ?Ä±tÄ±lan kÃ¶prÃ¼lerde uzun sÃ¼re hehrnagi bir kullanÄ±cÄ± bulunmayabilir. \nLÃ¼tfen \"AyrÄ±lmÄ±Å?\" daÄ?Ä±tÄ±m yÃ¶nteminin %skÃ¶prÃ¼ havuz atamasÄ±%s dosyalarÄ±nda \"AtanmamÄ±Å? (Unallocated)\" olarak gÃ¶rÃ¼leceÄ?ini unutmayÄ±n."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Yok"
+
+#: bridgedb/strings.py:138
+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 "DaÄ?Ä±tÄ±m yÃ¶ntemi \"Yok\" olan kÃ¶prÃ¼ler BridgeDB tarafÄ±ndan daÄ?Ä±tÄ±lmaz.\nBu kÃ¶prÃ¼lerin kullanÄ±cÄ±lara daÄ?Ä±tÄ±lmasÄ±, kÃ¶prÃ¼ iÅ?leticisinin sorumluluÄ?undadÄ±r.\nAktarÄ±cÄ± Arama iÃ§inde, yeni kurulmuÅ? bir kÃ¶prÃ¼nÃ¼n daÄ?Ä±tÄ±m yÃ¶nteminin bir gÃ¼n kadar \"Yok\" olarak gÃ¶rÃ¼ntÃ¼leneceÄ?ini unutmayÄ±n.\nSabÄ±rla bekleyin. Bir sÃ¼re sonra kÃ¶prÃ¼nÃ¼n gerÃ§ek daÄ?Ä±tÄ±m yÃ¶ntemi gÃ¶rÃ¼ntÃ¼lenir.\n"
+
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfen kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§eneklerini belirleyin:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 adresleri gerekli mi?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s gerekli mi?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "TarayÄ±cÄ±nÄ±z gÃ¶rselleri dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lemiyor."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "YukarÄ±daki gÃ¶rselde bulunan karakterleri yazÄ±n..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "KÃ¶prÃ¼lerinizi nasÄ±l kullanabilirsiniz"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Tor Browser Ã¼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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ã?nce %sTor Browser uygulamasÄ±nÄ± indirmelisiniz%s. Tor Browser Ã¼zerine\nkÃ¶prÃ¼lerin nasÄ±l ekleneceÄ?ini Tor Browser rehberinde bulabilirsiniz.\nWindow, Linux ya da OS X kullanÄ±yorsanÄ±z, ayrÄ±ntÄ±lÄ± bilgi almak iÃ§in %sburaya tÄ±klayÄ±n%s.\nAndroid kullanÄ±yorsanÄ±z, %sburaya tÄ±klayÄ±n%s."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Bu kÃ¶prÃ¼leri Tor Browser Ã¼zerine eklemek iÃ§in ayarlar bÃ¶lÃ¼mÃ¼ne \ngidin. \"Tor\"' Ã¼zerine tÄ±klayÄ±p, \"Bir kÃ¶prÃ¼ kullanÄ±lsÄ±n\" seÃ§eneÄ?ini iÅ?aretleyerek \n\"Bir kÃ¶prÃ¼ adresi yazÄ±n\" alanÄ±na kÃ¶prÃ¼ adreslerini yazÄ±n ya da yapÄ±Å?tÄ±rÄ±n."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ä°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?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(GizlenmemiÅ? Tor kÃ¶prÃ¼leri iste)."
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'Evet' seÃ§ip ardÄ±ndan 'Ä°leri' Ã¼zerine tÄ±klayÄ±n. Yeni kÃ¶prÃ¼lerinizi ayarlamak iÃ§in kÃ¶prÃ¼\nsatÄ±rlarÄ±nÄ± kopyalayarak metin kutusuna yapÄ±Å?tÄ±rÄ±n.\n'BaÄ?lan' Ã¼zerine tÄ±kladÄ±Ä?Ä±nÄ±zda artÄ±k hazÄ±rsÄ±nÄ±z! Sorun yaÅ?Ä±yorsanÄ±z, daha fazla yardÄ±m almak iÃ§in 'Tor AÄ?Ä± AyarlarÄ±' yardÄ±mcÄ±sÄ±ndaki 'YardÄ±m' dÃ¼Ä?mesine tÄ±klamayÄ± deneyin."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Bu iletiyi gÃ¶rÃ¼ntÃ¼ler."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Normal kÃ¶prÃ¼ler iste."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 kÃ¶prÃ¼leri iste."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± iste."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6 kÃ¶prÃ¼leri iste)."
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Herkese aÃ§Ä±k BridgeDB GnuPG anahtarÄ±nÄ±n bir kopyasÄ±nÄ± al."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(GizlenmiÅ? obfs4 kÃ¶prÃ¼leri iste)."
diff --git a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
index 7edd38e..8c07a2b 100644
--- a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>, 2019
@@ -15,116 +15,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-05 23:58+0000\n"
-"Last-Translator: Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð¸ Ð¿Ñ?Ð¸Ð½Ð¾Ñ?Ð¸Ð¼Ð¾ Ð½Ð°Ñ?Ñ? Ð²Ð¸Ð±Ð°Ñ?ÐµÐ½Ð½Ñ?! Ð©Ð¾Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð· Ð?Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ð¸Ñ?Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð¾Ð²Ð°"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "Ð?Ð¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ð²Ñ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ð¸ QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð²"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?Ñ?Ð°ÐºÐ¾Ñ?!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?Ð¾ Ñ?Ñ?Ð°Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ QR-ÐºÐ¾Ð´Ñ?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð². Ð?Ñ?Ð´Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ð¹Ð¾Ð³Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?Ð¼ Ð´Ð»Ñ? Ð·Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? QR-ÐºÐ¾Ð´Ñ?Ð², Ñ?Ð¾Ð± Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð² Ð½Ð° Ð¼Ð¾Ð±Ñ?Ð»Ñ?Ð½Ñ? Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð?Ð°Ð¼ Ñ?Ð»Ñ?Ð´ Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ñ?Ð¸ %s Ð¿Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ð¸Ñ?Ñ? %s Ñ? Ð²Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð½Ñ?Ð¸Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ñ?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ð¸ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
@@ -133,27 +148,27 @@ msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ñ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð¶Ð¾Ð´ÐµÐ½"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -161,69 +176,37 @@ msgstr "%sÐ¢%sÐ°Ðº!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð¦Ðµ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?; Ð±Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð½Ðµ Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ð´Ð°Ð¹Ñ?Ðµ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Ð?Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð¸ Ð¿ÐµÑ?ÐµÐ²Ð¸Ñ?Ð¸Ð»Ð¸ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ? Ñ?Ð²Ð¸Ð´ÐºÐ¾Ñ?Ñ?Ñ?. Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ñ?Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ñ?Ð½Ñ?Ð¼Ð°Ð»Ñ?Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð¼Ñ?Ð¶\nÐ»Ð¸Ñ?Ñ?Ð°Ð¼Ð¸ %s Ð³Ð¾Ð´Ð¸Ð½. Ð?Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ð»Ñ?Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð² Ñ?ÐµÐ¹ Ð¿ÐµÑ?Ñ?Ð¾Ð´ Ñ?Ð°Ñ?Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ñ? Ñ?Ð³Ð½Ð¾Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ?."
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð¸: (ÐºÐ¾Ð¼Ð±Ñ?Ð½Ñ?Ð²Ð°Ñ?Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð²ÐºÐ°Ð·Ð°Ð²Ñ?Ð¸ ÐºÑ?Ð»Ñ?ÐºÐ° Ð²Ð°Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð² Ð¾Ð´Ð½Ð¾Ñ?Ð°Ñ?Ð½Ð¾)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?Ð°Ñ?ÐºÐ°Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ð¼Ð¾ Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð£ Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? transport TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð´Ñ?Ñ?Ð¶Ðµ!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ? ÐºÐ»Ñ?Ñ?Ñ?"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð¦ÐµÐ¹ Ð»Ð¸Ñ?Ñ? Ð±Ñ?Ð² Ð·Ð³ÐµÐ½ÐµÑ?Ð¾Ð²Ð°Ð½Ð¾ Ð· Ñ?Ð°Ð¹Ð´Ñ?Ð³Ð°Ð¼Ð¸, Ñ?Ð´Ð¸Ð½Ð¾Ñ?Ð¾Ð³Ð°Ð¼Ð¸ Ñ? Ð±Ð»Ð¸Ñ?ÐºÑ?Ñ?ÐºÐ°Ð¼Ð¸\nÐ´Ð»Ñ? %s %s Ð¾ %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +217,7 @@ msgid ""
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ?Ð¸Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð´ÐµÐºÑ?Ð»Ñ?ÐºÐ¾Ð¼Ð° %sÑ?Ð¸Ð¿Ð°Ð¼Ð¸ Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð²%s,\nÑ?ÐºÑ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ð¾Ñ? Ð·Ð²'Ñ?Ð·ÐºÐ¸ Ð· Ð¼ÐµÑ?ÐµÐ¶ÐµÑ? Tor, Ñ?Ð¾ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ñ?Ñ? Ñ?Ð¾Ð±Ð¾Ñ?Ñ?\nÐ´Ð»Ñ? Ñ?Ð¸Ñ?, Ñ?Ñ?Ð¾ Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ñ? Ð?Ð°Ñ? Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ñ?Ð°Ñ?Ñ?Ðº, Ñ?Ð¾Ð± Ð²Ð¸Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸, Ñ?Ð¾ Ð?Ð¸\nÐ²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Tor. \n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -246,7 +229,7 @@ msgstr "Ð?ÐµÑ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6 Ñ?Ð°ÐºÐ¾Ð¶ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +238,169 @@ msgid ""
 "\n"
 msgstr "Ð?Ñ?Ñ?Ð¼ Ñ?Ð¾Ð³Ð¾, BridgeDB Ð¼Ð°Ñ? Ð±Ð°Ð³Ð°Ñ?Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¸Ñ? Ñ?Ðº Ð´Ð²ÐµÑ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² %s Ð±ÐµÐ·\nÐ²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð² %s, Ñ?ÐºÑ?, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð³Ð°Ñ?Ð½Ð¾, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ \nÐ¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ? Ð² Ð±Ð°Ð³Ð°Ñ?Ñ?Ð¾Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÐ°Ñ?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "Ð©Ð¾ Ñ?Ð°ÐºÐµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ð¾Ñ?Ñ?Ð¸ %s Ñ? Tor Ñ?ÐµÐ»Ðµ, Ñ?ÐºÑ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð?Ð°Ð¼ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ð¸Ð¹ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? %s. Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ð¾\nÐ?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð²\nÐ¿Ð¾Ñ?Ð»Ñ?Ð³ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸:\n%s, %s Ð°Ð±Ð¾ %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð¯ÐºÑ?Ð¾ Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð°Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð° %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐºÐ½Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ?Ðµ Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ Ð?Ð°Ñ? Ð²Ð¸Ð¿Ð°Ð´Ð¾Ðº, Ð² Ñ?Ð¾Ð¼Ñ? Ñ?Ð¸Ñ?Ð»Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº\nÐ¼Ð¾Ñ?Ñ?Ñ?Ð² Ñ? Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð², Ñ?ÐºÑ? Ð?Ð¸ Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ð»Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸, Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor,\nÑ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?, Ñ?ÐºÑ? Tor Ð²Ð¸Ð´Ð°Ð²Ð°Ð², Ñ? Ñ?.Ð´."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð?Ð°Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð³Ð¾"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸ ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð°Ñ?Ð¸Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ?Ð°Ð¼Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ð©Ð¾Ð± Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Tor Browser, Ñ?Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ? Ñ?Ð´Ñ?Ñ?Ñ? Ð½Ð°  %s Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÑ? Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Tor Browser %s Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ñ?Ð»Ñ?Ð´Ñ?Ð¹Ñ?Ðµ Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð¼ Ð´Ð»Ñ? Ñ?ÐºÐ°Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ?  Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?Ð¾Ð»Ð¸ Ð´Ñ?Ð°Ð»Ð¾Ð³ \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor\" Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ?Ñ?Ñ?Ñ?, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸\" Ñ? Ð´Ð¾Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹Ñ?ÐµÑ?Ñ?\nÐ¿Ñ?Ð´ÐºÐ°Ð·ÐºÐ°Ð¼ Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð°, Ð´Ð¾Ð¿Ð¾ÐºÐ¸ Ð²Ñ?Ð½ Ð½Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "Ð?Ð°Ñ?Ñ?Ð¹ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ð°Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?\nÐ´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? \"Ð¢Ð°Ðº\", Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ñ?\". Ð?Ð»Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¸Ñ? bridges, Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ðµ Ð»Ñ?Ð½Ñ?Ñ? bridge Ñ? Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?. Ð?Ð¾Ñ?Ñ?Ð¼, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?', Ñ?\nÐ²Ñ?Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸! Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ \"Ð?Ð¾Ð²Ñ?Ð´ÐºÐ°\" \nÐ² Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð¾Ð²Ñ? \"Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Tor' Ð´Ð»Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Ð?Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?."
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? vanilla bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Pluggable Transport Ð¿Ð¾ TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ ÐºÐ¾Ð¿Ñ?Ñ? Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° Ð´Ð»Ñ? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..cbafe76
--- /dev/null
+++ b/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Ali Kamran <kamran@xxxxxxxxxxxxxxxxxxxxxxxxxx>, 2019
+# Muhammad Sohaib Raza <sohaibraza000@xxxxxxxxx>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2020-02-04 10:59-0800\n"
+"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.7.0\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:138
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø²Ø¨Ø§Ù?"
+
+#: bridgedb/distributors/https/templates/base.html:92
+msgid "Report a Bug"
+msgstr "Ù?Ø³Ø¦Ù?Û? Ø±Ù¾Ù?Ø±Ù¹ Ú©Ø±Û?Úº"
+
+#: bridgedb/distributors/https/templates/base.html:95
+msgid "Source Code"
+msgstr "Ø³Ù?Ø±Ø³ Ú©Ù?Ú?"
+
+#: bridgedb/distributors/https/templates/base.html:98
+msgid "Changelog"
+msgstr "Ù?Ø§Ú¯ ØªØ¨Ø¯Û?Ù? Ú©Ø±Û?Úº"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ØªÙ?Ø§Ù? Ù?Ù?ØªØ®Ø¨ Ú©Ø±Û?Úº."
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Ú©Ù?Ú? Ø¸Ø§Û?Ø± Ú©Ø±Û?ÚºÛ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Ù?Ø²Û?Ø¯ Ø§Ù?ØªØ®Ø§Ø¨Ø§ØªÛ?"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ù?Û?Û?Úº"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Ú©Ù?Ø¦Û? Ù?Û?Û?Úº"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Û?Û? Ø§Û?Ú© Ø®Ù?Ø¯Ú©Ø§Ø± Ù¾Û?ØºØ§Ù? Û?Û?: Ø¨Ø±Ø§Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Ø¬Ù?Ø§Ø¨ Ù?Û? Ø¯Û?Ø¬Û?Û?]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr ""
+
+#: bridgedb/strings.py:47
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "BridgeDB Ù?Û?Úº Ø®Ù?Ø´ Ø§Ù?Ù?Ø¯Û?Ø¯"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Û?Û?Ù?Ù? Ø? %s"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Û?Û?Ù?Ù? Ø¯Ù?Ø³ØªÙ?!"
+
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+msgid "Public Keys"
+msgstr "Ø¹Ù?Ø§Ù?Û? Ú?Ø§Ø¨Û?"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+msgid "What are bridges?"
+msgstr ""
+
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:117
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:121
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:125
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:126
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:130
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:131
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:132
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Ú©Û?Ø§ Ø§Ù?Ù¾ Ú©Ù? Ø§Û?Ú© %s Ú?Ø§Ø¦Û?Û? Ø?"
+
+#: bridgedb/strings.py:136
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:141
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:143
+#, python-format
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:148
+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
+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
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: bridgedb/strings.py:164
+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
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: bridgedb/strings.py:169
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:171
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:174
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
diff --git a/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..2764f6e
--- /dev/null
+++ b/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,401 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# 
+# Translators:
+# Akmal <uzbadmin@xxxxxxxxx>, 2018
+# Shuhrat Dehkanov <k+transifex@xxxxxxx>, 2014
+# U A <u.almasov@xxxxxxxxx>, 2013
+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-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: uz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Uzr, nimadir xato ketdi."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Til"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Nosozlik haqida xabar berish"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Kod"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "OÊ»zgarishlar"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Barchasini belgilash"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR kodni koÊ»rsatish"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR kod olinmadi"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s-bosqich"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr " %s Tor brauzeri %sni yuklab olish"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s-bosqich"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s-qadam"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Ilg'or moslamalar"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "YoÊ»q"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "yoÊ»q"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sH%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Ko'priklaringiz:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Ko'priklar nima?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Ko'priklar %s Tor bog'lanish nuqtalari bo'lib, senzurani aylanib o'tishingizga yordam beradi."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "Ð?ÐµÑ?"
+
+#: bridgedb/strings.py:138
+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:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
index 39c5813..cf4d71b 100644
--- a/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,10 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Acooldude, 2016
+# Ä?á»©c Pháº¡m Minh <phamducvn.0308@xxxxxxxxx>, 2019
 # Khanh Nguyen <nguyenduykhanh85@xxxxxxxxx>, 2015-2016
 # Gary, 2016
 # Ngo Long <ngotienlong1996@xxxxxxxxx>, 2018
@@ -12,145 +13,160 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-07-19 14:23+0000\n"
-"Last-Translator: Ngo Long <ngotienlong1996@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: 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."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "NgÃ´n ngá»¯"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "BÃ¡o cÃ¡o lá»?i"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "MaÌ? NguÃ´Ì?n"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "Nháºt kÃ½ thay Ä?Ã´Ì?i"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "LiÃªn hÃªÌ£"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Chá»?n Táº¥t cáº£"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "HiÃªÌ?n thiÌ£ MaÌ? QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "MaÌ? QR cho caÌ?c Ä?Æ°á»?ng cáº§u ná»?i cuÌ?a baÌ£n"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "MaÌ? QR cho caÌ?c bridge cuÌ?a baÌ£n"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "CoÌ? veÌ? nhÆ° cÃ³ lá»?i khi Ä?ang láº¥y mÃ£ QR cá»§a báº¡n."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "MaÌ? QR chÆ°Ì?a nhá»¯ng Ä?Æ°á»?ng cáº§u ná»?i cuÌ?a baÌ£n. QuÃ©t noÌ? bÄ?Ì?ng mÃ´Ì£t triÌ?nh Ä?oÌ£c maÌ? QR vaÌ? sao cheÌ?p nhá»¯ng Ä?Æ°á»?ng cáº§u ná»?i lÃªn Ä?iÃªÌ£n thoaÌ£i vaÌ? caÌ?c thiÃªÌ?t biÌ£ khaÌ?c."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "Hiá»?n khÃ´ng cÃ³ sáºµn cáº§u ná»?i nÃ o..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "CoÌ? leÌ? baÌ£n nÃªn thÆ°Ì? %s quay laÌ£i %s vaÌ? choÌ£n mÃ´Ì£t loaÌ£i cáº§u ná»?i khaÌ?c!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "BÆ°Æ¡Ì?c %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "TaÌ?i xuÃ´Ì?ng %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "BÆ°Æ¡Ì?c %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "ChoÌ£n %sbridges%s"
+msgstr "Láº¥y %s cáº§u ná»?i %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
-msgstr "BÆ°Æ¡Ì?c %s3%s"
+msgstr "BÆ°Æ¡Ì?c %s 3 %s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "BÃ¢y giÆ¡Ì? thiÌ? %s thÃªm bridges Ä?oÌ? vaÌ?o Tor Browser %s"
+msgstr "BÃ¢y giÆ¡Ì? thiÌ? %s thÃªm nhá»¯ng cáº§u ná»?i Ä?Ã³ Ä?oÌ? vaÌ?o Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%shiÌ? cÃ¢Ì?n Ä?Æ°a cho tÃ´i bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "CaÌ?c TuÌ?y ChoÌ£n NÃ¢ng Cao"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "KhÃ´ng"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "rÃ´Ì?ng"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sV%sÃ¢ng!"
@@ -158,69 +174,37 @@ msgstr "%sV%sÃ¢ng!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sL%sÃ¢Ì?y Bridges"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ä?Ã¢y laÌ? tin nhÄ?Ì?n tá»± Ä?á»?ng; xin Ä?á»«ng tráº£ lá»?i.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "Bridges cuÌ?a baÌ£n Ä?Ã¢y:"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "BaÌ£n Ä?aÌ? vÆ°Æ¡Ì£t quaÌ? giÆ¡Ì?i haÌ£n tÃ´Ì?c Ä?Ã´Ì£. CÆ°Ì? tÆ°Ì? tÆ°Ì? thÃ´i! KhoaÌ?ng thÆ¡Ì?i gian daÌ?n caÌ?ch giÆ°Ì?a caÌ?c email laÌ? %s tiÃªÌ?ng Ä?Ã´Ì?ng hÃ´Ì?. TÃ¢Ì?t caÌ? caÌ?c email khaÌ?c trong khoaÌ?ng thÆ¡Ì?i gian naÌ?y Ä?ÃªÌ?u seÌ? biÌ£ boÌ? qua."
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "CaÌ?c LÃ?Ì£NH: (kÃªÌ?t hÆ¡Ì£p Ä?Ã´Ì?ng thÆ¡Ì?i nhiÃªÌ?u LÃ?Ì£NH Ä?ÃªÌ? chiÌ? Ä?iÌ£nh nhiÃªÌ?u lÆ°Ì£a choÌ£n)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "CaÌ?c transport TYPE Ä?Æ°á»£c há»? trá»£ hiá»?n thá»?i:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "NaÌ?y, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ChÃ o báº¡n!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "KhÃ³a cÃ´ng khai"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Email nÃ y Ä?Æ°á»£c táº¡o bá»?i cáº§u vá»?ng, ká»³ lÃ¢n vÃ  Ã¡nh sÃ¡ng láº¥p lÃ¡nh cho %s vÃ o %s luÌ?c %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,10 +212,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB coÌ? thÃªÌ? cung cÃ¢Ì?p caÌ?c Ä?Æ°Æ¡Ì?ng kÃªÌ?t nÃ´Ì?i vÆ¡Ì?i nhiÃªÌ?u %sloaÌ£i Pluggable Transports%s,\nchuÌ?ng coÌ? thÃªÌ? giuÌ?p che giÃ¢Ì?u Ä?Æ°Æ¡Ì?ng truyÃªÌ?n cuÌ?a baÌ£n Ä?ÃªÌ?n MaÌ£ng LÆ°Æ¡Ì?i Tor, laÌ?m Ä?Æ°Æ¡Ì?ng truyÃªÌ?n\ninternet cuÌ?a baÌ£n khoÌ? biÌ£ ngÆ°Æ¡Ì?i khaÌ?c theo doÌ?i hÆ¡n Ä?ÃªÌ? xaÌ?c Ä?iÌ£nh baÌ£n coÌ? Ä?ang sÆ°Ì? duÌ£ng Tor\nhay khÃ´ng.\n\n"
+msgstr "BridgeDB coÌ? thÃªÌ? cung cÃ¢Ì?p caÌ?c Ä?Æ°á»?ng cáº§u ná»?i vÆ¡Ì?i nhiÃªÌ?u %sloaÌ£i Pluggable Transports%s,\nchuÌ?ng coÌ? thÃªÌ? giuÌ?p che giÃ¢Ì?u Ä?Æ°Æ¡Ì?ng truyÃªÌ?n cuÌ?a baÌ£n Ä?ÃªÌ?n MaÌ£ng LÆ°Æ¡Ì?i Tor, laÌ?m Ä?Æ°Æ¡Ì?ng truyÃªÌ?n\ninternet cuÌ?a baÌ£n khoÌ? biÌ£ ngÆ°Æ¡Ì?i khaÌ?c theo doÌ?i hÆ¡n Ä?ÃªÌ? xaÌ?c Ä?iÌ£nh baÌ£n coÌ? Ä?ang sÆ°Ì? duÌ£ng Tor\nhay khÃ´ng.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -243,143 +227,178 @@ msgstr "Má»?t vÃ i Ä?Æ°Æ¡Ì?ng kÃªÌ?t nÃ´Ì?i vá»?i Ä?á»?a chá»? IPv6 cÅ©ng Ä?ang
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "ThÃªm vaÌ?o Ä?oÌ?, BridgeDB coÌ? rÃ¢Ì?t nhiÃªÌ?u bridge nguyÃªn gÃ´Ì?c %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"
+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/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
-msgstr "Bridges laÌ? giÌ??"
+msgstr "Cáº§u ná»?i laÌ? giÌ??"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridges %s laÌ? nhÆ°Ì?ng sÆ°Ì£ ngÆ°ng trÃªÌ£ cuÌ?a Tor -Tor relays-  nhÄ?Ì?m giuÌ?p traÌ?nh neÌ? sÆ°Ì£ kiÃªÌ?m duyÃªÌ£t."
+msgstr "%s Cáº§u ná»?i %s laÌ? nhÆ°Ì?ng sá»± tiáº¿p ná»?i cá»§a máº¡ng Tor -Tor relays-  nhÄ?Ì?m giuÌ?p traÌ?nh neÌ? sÆ°Ì£ kiÃªÌ?m duyÃªÌ£t."
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
-msgstr "TÃ´i cÃ¢Ì?n mÃ´Ì£t caÌ?ch khaÌ?c Ä?ÃªÌ? lÃ¢Ì?y bridges!"
+msgstr "TÃ´i cÃ¢Ì?n mÃ´Ì£t caÌ?ch khaÌ?c Ä?ÃªÌ? lÃ¢Ì?y cáº§u ná»?i!"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "CaÌ?ch khaÌ?c Ä?ÃªÌ? lÃ¢Ì?y bridges laÌ? gÆ°Ì?i mÃ´Ì£t email tÆ¡Ì?i %s. HaÌ?y lÆ°u yÌ? rÄ?Ì?ng baÌ£n phaÌ?i gÆ°Ì?i mÃ´Ì£t email\nsÆ°Ì? duÌ£ng Ä?iÌ?a chiÌ? tÆ°Ì? mÃ´Ì£t trong nhÆ°Ì?ng nhaÌ? cung cÃ¢Ì?p email sau:\n%s, %s hoÄ?Ì£c %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
-msgstr "Bridges cuÌ?a tÃ´i khÃ´ng hoaÌ£t Ä?Ã´Ì£ng! TÃ´i cÃ¢Ì?n giuÌ?p Ä?Æ¡Ì?!"
+msgstr "Cáº§u ná»?i cuÌ?a tÃ´i khÃ´ng hoaÌ£t Ä?Ã´Ì£ng! TÃ´i cÃ¢Ì?n giuÌ?p Ä?Æ¡Ì?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "NÃªÌ?u Tor cuÌ?a baÌ£n khÃ´ng hoaÌ£t Ä?Ã´Ì£ng, baÌ£n nÃªn gÆ°Ì?i email cho %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Cá»? gáº¯ng cung cáº¥p cÃ ng nhiá»?u thÃ´ng tin vá»? trÆ°á»?ng há»£p cá»§a báº¡n náº¿u cÃ³ thá»?,\nbao gá»?m danh sÃ¡ch nhá»¯ng bridges vaÌ? Pluggable Transports baÌ£n Ä?aÌ? thÆ°Ì? sÆ°Ì?\nduÌ£ng, phiÃªn báº£n cá»§a Tor Browser, vÃ  báº¥t ká»³ thÃ´ng Ä?iá»?p nÃ o mÃ  Tor Ä?Æ°a ra\ncho baÌ£n, v.v..."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Náº¿u trÃ¬nh duyá»?t Tor Browser cá»§a báº¡n khÃ´ng thá»? káº¿t ná»?i, xin hÃ£y xem xÃ©t %s vÃ  %s cá»§a chÃºng tÃ´i."
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
-msgstr "Bridge lines cuÌ?a baÌ£n Ä?Ã¢y:"
+msgstr "Cáº§u ná»?i cuÌ?a baÌ£n Ä?Ã¢y:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
-msgstr "LÃ¢Ì?y Bridges!"
+msgstr "LÃ¢Ì?y Cáº§u ná»?i!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "KhÃ´ng cÃ³"
+
+#: bridgedb/strings.py:138
+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:133
+#: bridgedb/strings.py:148
 msgid "Please select options for bridge type:"
-msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho bridge type:"
+msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho loáº¡i cáº§u ná»?i:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "BaÌ£n coÌ? cÃ¢Ì?n caÌ?c Ä?iÌ£a chiÌ? IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BaÌ£n coÌ? cÃ¢Ì?n mÃ´Ì£t %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
-msgstr "TriÌ?nh duyÃªÌ£t cuÌ?a baÌ£n khÃ´ng hiÃªÌ?u thiÌ£ hiÌ?nh aÌ?nh chiÌ?nh xaÌ?c."
+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:140
+#: bridgedb/strings.py:155
 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:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
-msgstr "LaÌ?m sao Ä?ÃªÌ? bÄ?Ì?t Ä?Ã¢Ì?u sÆ°Ì? duÌ£ng bridges cuÌ?a baÌ£n"
+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:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "Ä?ÃªÌ? nhÃ¢Ì£p bridges 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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 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 Tor Network' 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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "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 Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "ChoÌ£n 'Ä?uÌ?ng' vaÌ? sau Ä?oÌ? nhÃ¢Ì?n 'TiÃªÌ?p theo'. Ä?ÃªÌ? cÃ¢Ì?u hiÌ?nh bridges mÆ¡Ì?i cuÌ?a baÌ£n, sao cheÌ?p vaÌ? daÌ?n bridge lines 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 Tor Network' Ä?ÃªÌ? nhÃ¢Ì£n Ä?Æ°Æ¡Ì£c sÆ°Ì£ giuÌ?p Ä?Æ¡Ì? tÃ´Ì?t hÆ¡n."
-
-#: bridgedb/strings.py:167
-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:171
-msgid "Request vanilla bridges."
-msgstr "YÃªu cÃ¢Ì?u bridges nguyÃªn gÃ´Ì?c."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "YÃªu cÃ¢Ì?u bridges cho IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "YÃªu cáº§u má»?t Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Láº¥y mÃ´Ì£t baÌ?n sao cá»§a chiÌ?a khÃ³a GnuPG cÃ´ng cá»?ng cuÌ?a BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
index f55dd34..20d797d 100644
--- a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,134 +1,152 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # khi, 2013
 # khi, 2013
 # khi, 2013
-# Christopher Meng <i@xxxxxxxx>, 2012
+# Christopher M <i@xxxxxxxx>, 2012
+# Cloud P <heige.pcloud@xxxxxxxxxxx>, 2019
+# ff98sha, 2019-2020
 # hanl <iamh4n@xxxxxxxxx>, 2011
 # Meng San, 2014,2016
 # leungsookfan <leung.sookfan@xxxxxxxxxx>, 2014
 # Meng San, 2016
 # Mingye Wang <arthur200126@xxxxxxxxx>, 2016
+# Scott Rhodes <starring169@xxxxxxxxx>, 2020
 # khi, 2014-2015
 # YFdyh000 <yfdyh000@xxxxxxxxx>, 2014-2015
-# Yikai Yang <ff98sha@xxxxxxxxx>, 2019
+# ff98sha, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-30 00:43+0000\n"
-"Last-Translator: Yikai Yang <ff98sha@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "è¯è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "æ?¥å??æ¼?æ´?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "æº?ä»£ç ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "æ?´æ?¹æ?¥å¿?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è??ç³»æ?¹å¼?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é??æ?©å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "æ?¾ç¤ºäº?ç»´ç ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ç½?æ¡¥äº?ç»´ç ?"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "å??å??ï¼?"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "è?·å??äº?ç»´ç ?æ?¶å?ºé??ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "äº?ç»´ç ?å??å?«ç½?æ¡¥ä¿¡æ?¯ã??å?©ç?¨äº?ç»´ç ?æ?«æ??ç¨?åº?ï¼?å?¯å°?ç?¸åº?ç??ç½?æ¡¥ä¿¡æ?¯å¤?å?¶å?°æ??æ?ºæ??å?¶ä»?è®¾å¤?ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "è¯?è¯? %sè¿?å??%så?°å??ä¸?é¡µé?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "ç¬¬ %s 1 %s æ¥"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è½½ %s Tor æµ?è§?å?¨ %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "ç¬¬ %s 2 %s æ¥"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "è?·å?? %s ç½?æ¡¥ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "ç¬¬ %s 3 %s æ¥"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
@@ -137,27 +155,27 @@ msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é«?çº§é??é¡¹"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "æ? "
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "æ?¯(%sY%s)ï¼?"
@@ -165,69 +183,37 @@ msgstr "æ?¯(%sY%s)ï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "è?·å??ç½?æ¡¥(%sG%s)"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[è¿?æ?¯ä¸?å°?è?ªå?¨ç??æ??ç??é?®ä»¶ï¼?è¯·å?¿å??å¤?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[è¿?æ?¯ä¸?ä»½è?ªå?¨å??é??ç??é?®ä»¶ã??]"
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "æ?¨å·²è¶?å?ºäº?å??é??é¢?ç??ç??é??å?¶ï¼?è¯·æ?¢æ?¢æ?¥ï¼?ä¸¤å°?é?®ä»¶ä¹?é?´é??è¦?æ??å°? %s å°?æ?¶ç??é?´é??ã??å?¨é?´é??æ??é?´å??å?ºç??æ??æ??é?®ä»¶å°?è¢«å¿½ç?¥ã??"
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "å?½ä»¤ï¼?ï¼?ç»?å??ä½¿ç?¨å?½ä»¤å?¯å??æ?¶æ??å®?å¤?ä¸ªé??é¡¹ï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "æ¬¢è¿?æ?¥å?° BridgeDBï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??å?¯ç?¨ç??ä¼ è¾?ç±»å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ä½ å¥½ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "å?¬å?±å¯?å??"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "æ?¬é?®ä»¶æ?¯å¯¹ %s ç??è?ªå?¨å??å¤?ï¼?æ?¥æ?? %s  %sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "å¦?æ??è¿?äº?ç½?æ¡¥ä¸?æ?¯ä½ æ??é??è¦?ç??ï¼?å??å¤?è¯¥é?®ä»¶å¹¶å?¨ä¿¡æ?¯ç??ä¸»ä½?é?¨å??å??å?«å¦?ä¸?ç??å?½ä»¤ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -238,7 +224,7 @@ msgid ""
 msgstr "BridgeDB æ??ä¾?å¤?ç§?%så?¯æ??æ??ä¼ è¾?%sç½?æ¡¥ï¼?ç?¨äº?æ··æ·? Tor ç½?ç»?ç??è¿?æ?¥ï¼?ä»?è??è®©ç½?ç»?ç??æ?§è??é?¾ä»¥å?¤æ?ä½ å?¨ä½¿ç?¨ Torã??\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -250,7 +236,7 @@ msgstr "å?¦å¤?æ??ä¾?ä¸?äº?IPv6æ ¼å¼?ç??ç½?æ¡¥ï¼?ä¸?è¿?æ??äº?å?¯æ??æ??ä¼ è¾?ç±»
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -259,134 +245,169 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s é??å?¯æ??æ??ä¼ è¾? %s ç??æ?®é??ç½?æ¡¥ã??\nè?½ç?¶å?¬èµ·æ?¥ä¸?å¤?é?·ï¼?ä½?æ?¯è¿?äº?æ?®é??ç½?æ¡¥ä¾?ç?¶å?¯ä»¥å?¨å¾?å¤?æ??å?µä¸?å¸®å?©ç»?è¿?å®¡æ?¥ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "ä»?ä¹?æ?¯ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%sç½?æ¡¥%så?³ Tor ä¸ç»§è??ç?¹ï¼?ç?¨äº?å¸®å?©ç?¨æ?·ç»?è¿?å®¡æ?¥æ??å°?é??ã??"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "é??è¦?ä½¿ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å??é??ç?µå?é?®ä»¶è?³ %sã??æ³¨æ??ï¼?å¿?é¡»ä½¿ç?¨ä»¥ä¸?ç?µå?é?®ç®±å??é??è¯·æ±?ï¼?%sã??%s æ?? %sã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å?? %s å??é??é?®ä»¶ã??\nå°?é?®ä»¶ä¸»é¢?ç??ç©ºï¼?å¹¶å?¨é?®ä»¶æ£æ??å??â??get transport obfs4â??ã??\nè¯·æ³¨æ??ï¼?ä½ å¿?é¡»ä½¿ç?¨ä¸?å??é?®ä»¶æ??å?¡å??\næ??ä¾?ç??é?®ç®±å??é??é?®ä»¶ï¼?%s æ?? %sã??"
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "ç?¨ç½?æ¡¥ä¹?æ? æ³?è¿?æ?¥ï¼?é??è¦?å¸®å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?è¯·å??é?®ä»¶è?³ %sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "è¯·å°½é??è¯¦ç»?å?°æ??è¿°ä½ ç??æ??å?µï¼?å??æ?¬æ??ç?¨ç??ç½?æ¡¥å??å?¶ç±»å??ï¼?Tor æµ?è§?å?¨ç??æ?¬ä»¥å??ä»»ä½? Tor æ?¾ç¤ºç??ä¿¡æ?¯ç?ç?ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "å¦?æ??æ?¨ç?? Tor æµ?è§?å?¨æ? æ³?è¿?æ?¥ï¼?è¯·æ?¥ç??%så??%sã??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "è?·å¾?ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "ç½?æ¡¥å??å??æ?ºå?¶"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "æ? "
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "è¯·é??æ?©ç±»å??ç±»å??ã??"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¯å?¦é??è¦? %sï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "è¯·è¾?å?¥ä¸?å?¾ä¸ç??å?ç¬¦ï¼?ä¸?å?ºå??å¤§å°?å??ï¼?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?ä½¿ç?¨ç½?æ¡¥"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?è¯·å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?è½½é¡µé?¢ %s ç??è¯´æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "é¦?å??ï¼?æ?¨é??è¦?%sä¸?è½½ Tor Browser%sã??æ??ä»¬ç?? Tor Browser ç?¨æ?·æ??å??è§£ç?äº?å¦?ä½?ä¸º Tor Browser æ·»å? æ?¨ç??ç½?æ¡¥ã??å¦?æ??æ?¨æ£å?¨ä½¿ç?¨ Windowsï¼?Linux æ??è?? OS Xï¼?%sç?¹å?»è¿?é??%sä»¥è¯¦ç»?äº?è§£ã??å¦?æ??æ?¨æ£å?¨ä½¿ç?¨å®?å??ç³»ç»?ï¼?%sç?¹å?»è¿?é??%sã??"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "å½?â??Tor ç½?ç»?è®¾ç½®â?? å¯¹è¯?æ¡?å?ºç?°æ?¶ï¼?ç?¹å?»â??é??ç½®â?? ï¼?ç?¶å??æ ¹æ?®å??å¯¼æ??ä½?ï¼?ç?´å?°ç??å?°ä¸?é?¢ç??é?®é¢?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "æ??å¼?ä½ ç??æµ?è§?å?¨å??å¥½ä»¥æ·»å? è¿?äº?ç½?æ¡¥å?°ä½ ç??Tor æµ?è§?å?¨ä¸ï¼?ç?¹å?»â??Torâ??ï¼?ç?¶å??å°?å®?ä»¬å¡«å?¥â??æ??ä¾?ä¸?ä¸ªç½?æ¡¥â??ä¸?æ ?ä¸ã??"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "ç½?ç»?æ??ä¾?å??ï¼?ISPï¼?æ??å?¶ä»?äººæ?¯å?¦å¯¹ Tor ç½?ç»?è¿?æ?¥è¿?è¡?å®¡æ?¥æ??å°?é??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "ï¼?è¯·æ±?é??æ··æ·? Tor ç½?æ¡¥ã??ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?è¯·å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?å¸®å?©ï¼?è¯·ç?¹å?»â??Tor ç½?ç»?è®¾ç½®â??å??å¯¼çª?å?£ä¸ç??â??å¸®å?©â??æ??é?®ã??"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "æ?¾ç¤ºè¿?æ?¡ä¿¡æ?¯ã??"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "è¯·æ±?æ?®é??ç½?æ¡¥ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "è¯·æ±?IPv6ç½?ç»?ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§ç±»å??è¯·æ±?ä¸?å??ç??å?¯æ??æ??ä¼ è¾?ç½?æ¡¥ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr "(è¯·æ±?IPv6ç½?æ¡¥ã??)"
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "è?·å?? BridgeDB ç?? GnuPG å?¬å?±å¯?å??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "ï¼?è¯·æ±?obfs4æ··æ·?ç½?æ¡¥ã??ï¼?"
diff --git a/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
index d82df60..99b955f 100644
--- a/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Casper LI <casper.hk@xxxxxxxxxxx>, 2013
@@ -13,116 +13,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "èª?è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "æ?´æ?°æ?¥èª?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è?¯çµ¡è³?è¨?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é?¸æ??å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "é¡¯ç¤ºQRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ä½ å??æ©?æ?¥ç·?è·¯QRCode"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "æ??å??é¡?ï¼?"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "æ??ç??QRCodeæ??ä¼¼ä¹?ç?¼ç??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "æ¤QRCodeå?«ä½ å??æ©?æ?¥ç·?è·¯ã??ä»¥æµ?å??è£?ç½®æ??ç??å?¯å??å¾?ä½ å??æ©?æ?¥ç·?è·¯ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??ç?¡å?¯ç?¨å??æ©?æ?¥å?¨â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "æ??è??å?¯å??è©¦%sè¿?å??%sï¼?ç?¶å¾?é?¸å??å??å??å??æ©?æ?¥é¡?å??ï¼?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "æ¥é©?%s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è¼?%s Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "æ¥é©?%s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾?%sæ©?æ?¥å?¨%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©?%s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
@@ -131,27 +146,27 @@ msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sç??%sæ??æ©?æ?¥ï¼?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sæ?¯%sï¼?"
@@ -159,69 +174,37 @@ msgstr "%sæ?¯%sï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%så??å¾?%sæ©?æ?¥å?¨"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[å?¢å??ä¿?è?ªå??å??è¦?è¨?æ?¯ã??è«?å??å¥½å??è¦?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "ä½ å·²è¶?é??é??åº¦é??å?¶ã??è«?æ¸?æ?¢é??åº¦ï¼?é?»é?µä¹?é??å??æ??ç?æ??é??ç?º%så??å°?æ??ã??å?¢æ®µæ??é??å?§å?¨é?¨å?¶ä»?é?µä»¶å°?è¢«å¿½ç?¥ã??"
 
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
 msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "æ??ä»¤ï¼?(å?¯å°?å¤?å??æ??ä»¤çµ?å??ä¸?é½?ä»¥ä¾¿å??æ??æ??å®?å¤?å??é?¸é ?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "æ¡è¿?ä½¿ç?¨BridgeDBï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??æ?¯æ?´å??å?³è¼¸é¡?å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "å?¿ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "æ??å??ï¼?ä½ å¥½ï¼?"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "å?¬å??"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "å?¢å??%så??é?»é?µä½¿ç?¨rainbowsã??unicornså??sparklesç?¢ç??ï¼?æ??é??ä¿?%så??%sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +215,7 @@ msgid ""
 msgstr "BridgeDBå?¯æ??ä¾?å¹¾ç¨®%sPluggable Transports%så??æ©?æ?¥ï¼?\nå¹«ä½ ä»¤äººæ··æ·?å??é?£æ?¥å?°Toræ´?è?¥è·¯ç?±ç¶²çµ¡ï¼?é??é??ç?£è¦?ä½ å??\nç¶²çµ¡æµ?é??å??ç¢ºå®?ä½ æ£ä½¿ç?¨Toræ´?è?¥è·¯ç?±æ??æ?´å? å?°é?£ã??\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -244,7 +227,7 @@ msgstr "ä»²æ??å?²å?·æ??IPv6ä½?å??å??æ©?æ?¥å?¨ï¼?é??ç?¶æ??å?²Pluggable\nTransport
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +236,169 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDBæ??æ?®é??å??æ©?æ?¥å?¨%sï¼?ç?¡ä»»ä½?\nPluggable Transports %sï¼?æ??è??è?½èµ·å??å??å??ï¼?ä½?\nä»?æ??å?©æ?¼è¦?é?¿å¥½å¤?æ??æ³?ä¸?å??ç¶²çµ¡å¯©æ?¥ã??\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "å?©ä¿?æ©?æ?¥ï¼?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%sæ©?æ?¥å?¨%sä¿?Toræ´?è?¥è·¯ç?±è½?å??ç«?ï¼?å?¯å¹«ä½ è¦?é?¿å¯©æ?¥ã??"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "æ??é??è¦?å?¦ä¸?æ?¹å¼?å??æ©?æ?¥ï¼?"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?å??å¾?æ©?æ?¥å??æ?¹å¼?ä¿?é?»é?µå?°%sã??è«?æ³¨æ??ï¼?ä½ é ?\nä½¿ç?¨ä¸?å??é?»é?µæ??ä¾?è??å??ä½?å??å??å¯?é?»é?µï¼?\n%sã??%sæ??%sã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸é??ä½?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??Toræ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?å?¯é?»é?µå?°%sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ç?¡å?¯è?½å??å?«æ??å¤?æ??é??ä½ æ??æ³?å??è³?è¨?ï¼?å??æ?¬ä½ å??è©¦ä½¿ç?¨é??å??\næ©?æ?¥å??Pluggable Transportsæ¸?å?®ã??Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ç??æ?¬ï¼?\nä»¥å??Toræ´?è?¥è·¯ç?±é¡¯ç¤ºå??ä»»ä½?è¨?æ?¯ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸å??æ©?æ?¥å?¨é¡?å??ï¼?"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "ä½ é??è¦?IPv6ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "ä½ é??è¦?%så??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "ä½ å??ç??è¦½å?¨å??è?½å¤ æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "è¼¸å?¥ä¸?é?¢å??å??ä¸å??å?å??â?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "é»?æ¨£é??å§?ä½¿ç?¨æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "å°?æ©?æ?¥å?¨è¼¸å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ï¼?è«?é¦?å??å??å¾?%s Toræ´?è?¥è·¯ç?±\nç??è¦½å?¨ä¸?è¼?é ?é?¢%sï¼?ä¸¦æ??ç?§é ?é?¢ä¸?å??æ??ç¤ºä¸?è¼?å??å??å??Toræ´?è?¥\nè·¯ç?±ç??è¦½å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ç?¶ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??è©±å?£å½?å?ºæ??ï¼?æ?³ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§\næ??ç¤ºï¼?ç?´å?°å?¶è¦?æ±?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "ä½ å??ç¶²çµ¡æ??å??æ??ä¾?è??(ISP)æ??å??æ??é?»æ??æ??é??æ¿¾Toræ´?è?¥è·¯ç?±ç¶²çµ¡å??é?£ç·?ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "é?¸å??ã??æ?¯ã??ï¼?ç?¶å¾?æ?³ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?°æ©?æ?¥å?¨ï¼?è«?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼å?°æ??å?è¼¸å?¥å?£ä¸ã??æ??å¾?ï¼?æ?³ã??é?£æ?¥ã??ã??\nå¦?æ??é??å?°éº»ç?©ï¼?è«?å??è©¦æ?³ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??å??ã??èª¬æ??ã??\nå°?æ±?é?²ä¸?æ¥å??å?©ã??"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "é¡¯ç¤ºæ¤è¨?æ?¯ã??"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "è«?æ±?Vanillaæ©?æ?¥å?¨ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "è«?æ±?IPv6æ©?æ?¥å?¨ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§TYPEè«?æ±?Pluggable Transportã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "å??å¾?BridgeDBå?¬å?±GnuPGé??å??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
index 502b260..9cdc685 100644
--- a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # AgustÃn Wu <losangwuyts@xxxxxxxxx>, 2016
 # Chi-Hsun Tsai, 2017
 # danfong <danfong.hsieh@xxxxxxxxx>, 2014
+# Hsiu-Ming Chang <cges30901@xxxxxxxxx>, 2020
+# Joshua Chang <j.cs.chang@xxxxxxxxx>, 2019
 # LNDDYL, 2014
 # guihu, 2016
 # Cheung Hung, 2015
@@ -14,116 +16,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-23 14:36+0000\n"
-"Last-Translator: å?é?¦ ç??\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. 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/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "èª?è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:94
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
 msgid "Changelog"
 msgstr "è®?æ?´è¨?é??"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è?¯çµ¡è³?è¨?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é?¸æ??å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "é¡¯ç¤º QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "æ?¨æ©?æ?¥ç?¨ç?? QRCode"
 
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr "æ??å??é¡?ï¼?"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
 msgid "It seems there was an error getting your QRCode."
 msgstr "æ??æ?? QRCode æ??ä¼¼ä¹?ç?¼ç??é?¯èª¤"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "é??å?? QRCode å?«æ??æ?¨ç??æ©?æ?¥å?¨ç?¸é??è³?è¨?ï¼?å?©ç?¨ QRCode è®?å??ç¨?å¼?å°?æ¤è³?è¨?è¤?è£½é?²è¡?å??é??ç®?è£?ç½®ä¸?ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¨æ?¥å?¯ç?¨....."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " ä¹?è¨±æ?¨æ??å??è©¦ %s å??å?° %sï¼?ç?¶å¾?é?¸æ??ä¸?å??ç??æ©?æ?¥é¡?å??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "æ¥é©? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è¼? %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "æ¥é©? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾? %s æ©?æ?¥å?¨ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
@@ -132,27 +149,27 @@ msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s %s çµ¦æ??æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -160,69 +177,37 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s è¨å®?æ©?æ?¥å?¨"
 
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[é??æ?¯ä¸?å??è?ªå??é?µä»¶;è«?ä¸?è¦?å??è¦?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
 
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
 msgid "Here are your bridges:"
 msgstr "é??æ?¯æ?¨ç??æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "æ?¨å·²è¶?é??é??åº¦é??å?¶ã??è«?æ¸?æ?¢é??åº¦ï¼?é?»å?é?µä»¶ä¹?é??ç??æ??ç?æ??é??ç?º %s å??å°?æ??ã??è¶?é??ç??è©±ï¼?å?¨é??æ®µæ??é??å?§æ??æ??ç??é?µä»¶å°?è¢«å¿½ç?¥ã??"
 
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "å?½ä»¤ï¼?(å?¯å°?å¤?å??å?½ä»¤çµ?å??ä¸?èµ·ä»¥ä¾¿å??æ??æ??å®?å¤?å??é?¸é ?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "æ¡è¿?ä½¿ç?¨ BridgeDBï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??æ?¯æ?´ç??å?³è¼¸é¡?å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "å?¿ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "å?¬é??é??é?°"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
 msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "é??å°?é?»å?é?µä»¶æ?¯ç?º %s æ??ç?¢ç??\nå?¨ %s å?¨ %sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +218,7 @@ msgid ""
 msgstr "BridgeDB å?¯ä»¥ä½¿ç?¨å¹¾ç¨®å?¯æ??æ??å?³è¼¸ %s ç?? %stypes ä¾?æ??ä¾?æ©?æ?¥ï¼?\nå®?å?¯ä»¥å¹«å?©æ?¨æ··æ·?é?£æ?¥å?° Tor Networkï¼?ä½¿å?¶ä»»ä½?äººè??ç?±ç?£ç??æ?¨ç??ç¶²è·¯æµ?\né??ä¾?ç¢ºå®?æ?¨æ£ä½¿ç?¨ Tor æ??æ?´å? å?°é?£\nã??\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -245,7 +230,7 @@ msgstr "æ??äº?å?·æ?? IPv6 ä½?å??ç??æ©?æ?¥å?¨ä¹?å?¯ä½¿ç?¨ï¼?é??ç?¶æ??äº? Pluggabl
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +239,169 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥å?¨ %sï¼?æ²?æ??ä»»ä½?\nå?¯æ??æ??å?³è¼¸ %sï¼?é??ä¹?è¨±è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??ç¶²è·¯å¯©æ?¥ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
 msgid "What are bridges?"
 msgstr "ä»?éº¼æ?¯æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s æ©?æ?¥å?¨ %s æ?¯ä¸?ç¨®æ´?è?¥è·¯ç?±ç??ä¸ç¹¼ç¯?é»?ï¼?å?¯å¹«å?©æ?¨è¦?é?¿å¯©æ?¥ã??"
 
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
 msgid "I need an alternative way of getting bridges!"
 msgstr "æ??é??è¦?ä½¿ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you must\n"
-"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?ç¨®å??å¾?æ©?æ?¥ç??æ?¹å¼?ç?ºç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨å¾?ä¸?å??é?»å?é?µä»¶æ??ä¾?å» å??ä¹?ä¸?ç??ä½?å??ä¾?ç?¼é??é?»å?é?µä»¶:\n%s, %s æ?? %sã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "å??å¾?æ©?æ?¥ç??å?¦ä¸?ç¨®æ?¹å¼?æ?¯å?³é??é?»å?é?µä»¶è?³ %sã??é?»å?é?µä»¶ä¸»æ?¨\nç??ç©ºï¼?é?µä»¶æ?¬æ??å¯«ã??get transport obfs4ã??ã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨ä¾?è?ªä¸?å??é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ç??ä½?å??å?³é??é?»å?é?µä»¶ï¼?%s æ?? %sã??"
 
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
 msgid "My bridges don't work! I need help!"
 msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??æ?¨ç??æ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?æ?¨æ??è©²ç?¼é??é?»å?é?µä»¶çµ¦ %sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
 msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "è«?å??å?¯è?½ç??çµ¦æ??å??æ?´å¤?é??æ?¼æ?¨ç??å??é¡?ä¹?ç?¸é??è³?è¨?ï¼?å??å?«æ?¨å??è©¦ä½¿ç?¨é??ç?? \næ©?æ?¥å?¨å??å?¯æ??æ??å?³è¼¸ã??æ?¨ç??æ´?è?¥è·¯ç?±ç??è¦½å?¨ç??æ?¬\nä»¥å??æ´?è?¥è·¯ç?±çµ¦å?ºç??ä»»ä½?è¨?æ?¯ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "å¦?æ?? Tor Browser ç?¡æ³?é?£ç·?ï¼?è«?æ?¥ç?? %s å??æ??å??ç?? %sã??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
 msgid "Here are your bridge lines:"
 msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, 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:115
+#, 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:119
+#, 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:125
+#, 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:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, 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:137
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:138
+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:148
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¨é??è¦? %s å??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
 msgid "Your browser is not displaying images properly."
 msgstr "æ?¨ç??ç??è¦½å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
 msgid "Enter the characters from the image above..."
 msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?é??å§?ä½¿ç?¨æ?¨ç??æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
-msgstr "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸?è¼?é ?é?¢ %s ä¸¦æ??ç?§é ?é?¢ä¸?ç??èªªæ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??è¦½å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ç?¶ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??å°?è©±å½?å?ºæ??ï¼?æ??ä¸?ä¸?ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§è¨å®?ç²¾é??ç??å°?å¼?é?²è¡?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
-msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
-msgstr "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??ä¾?æ??å??(ISP)é?»æ??æ??é??æ¿¾æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?å??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥å?¨ï¼?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼ä¸?å?°æ??å?è¼¸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??å°±å¥½ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??è©¦æ??ä¸?ä¸?ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??èª¬æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "é¡¯ç¤ºæ¤è¨?æ?¯ã??"
-
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "å??å¾? BridgeDB ä¸?ç?? GnuPG å?¬é??é??é?°å?¯æ?¬ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [bridgedb/master] Make script Python 3-compatible.
Next by Author: [tor-commits] [bridgedb/develop] Merge branch 'defect/33945' into develop
Previous by thread: [tor-commits] [bridgedb/master] Add service status check
Next by thread: [tor-commits] [bridgedb/master] Allow passing the Gmail key as env variable.
Index(es):
- Author
- Thread