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

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
From: translation@xxxxxxxxxxxxxx
Date: Fri, 4 Oct 2019 01:16:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 03 Oct 2019 21:17:08 -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: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit a037fcc9d8269f013dbd375ce9170921b1840350
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Fri Oct 4 01:16:01 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 ar/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 az/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 be/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 bg/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 bn/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 bs/LC_MESSAGES/bridgedb.po    | 138 ++++++++++++++++++++--------------------
 ca/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 cs/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 da/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 de/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 el/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 en_GB/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 eo/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 es/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 es_AR/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 es_MX/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 et/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 eu/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 fa/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 fi/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 fr/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ga/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 gd/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 gl/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 gu/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 he/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 hi/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 hr/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 hu/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 hy/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 id/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 is/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 it/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ja/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 ka/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 kk/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 km/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ko/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 lt/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 lv/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 mk/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ml/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 mr/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 ms_MY/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 nb/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 nl/LC_MESSAGES/bridgedb.po    | 141 +++++++++++++++++++++--------------------
 nl_BE/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 nn/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 pa/LC_MESSAGES/bridgedb.po    | 138 ++++++++++++++++++++--------------------
 pl/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 pt_BR/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 pt_PT/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 ro/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ru/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sk/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sl/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sq/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sr/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sv/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 sw/LC_MESSAGES/bridgedb.po    | 140 +++++++++++++++++++++--------------------
 ta/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 templates/bridgedb.pot        | 143 ++++++++++++++++++++++--------------------
 th/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 tr/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 uk/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 ur/LC_MESSAGES/bridgedb.po    | 138 ++++++++++++++++++++--------------------
 uz/LC_MESSAGES/bridgedb.po    | 138 ++++++++++++++++++++--------------------
 vi/LC_MESSAGES/bridgedb.po    | 142 +++++++++++++++++++++--------------------
 zh_CN/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 zh_HK/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 zh_TW/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
 71 files changed, 5167 insertions(+), 4881 deletions(-)

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index b8d464f56..b5cae6095 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Abderrahman Ait Ali <abde.aitali@xxxxxxxx>, 2017
 # A. Hassan <a_hassan@xxxxxxxxxxx>, 2015
 # Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2014
@@ -32,17 +31,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-04 10:15+0000\n"
-"Last-Translator: shadows99 <nabils51@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -54,35 +72,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ø¹Ø°Ø±Ø§Ù?! ØØ¯Ø« Ø®Ø·Ø£ Ù?Ù? Ø·Ù?Ø¨Ù?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ø§ØªØµÙ? Ø¨Ù?Ø§"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ØØ¯Ø¯ Ø§Ù?Ù?Ù?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ø£Ø¸Ù?Ø± Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ (QRCode)"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø®Ø·Ù?Ø· Ø§Ù?Ù?ØµÙ?"
 
@@ -90,58 +104,58 @@ msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø®Ø·Ù?Ø· Ø§Ù?Ù?ØµÙ?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ù?Ù?Ø£Ø³Ù? Ù?Ù? Ù?ØªÙ? Ø§Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ù?Ø§ Ø·Ù?Ø¨Øª"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ù?Ø¨Ø¯Ù? Ø£Ù? Ù?Ù?Ø§Ù? Ø®Ø·Ø£ Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø±Ù?Ø²Ù? Ù?Ù?Ø¥Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø°Ø§ Ù?ØØªÙ?Ù? Ø¹Ù?Ù? Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? .Ø§Ù?Ø±Ø£ Ø§Ù?Ø±Ù?Ø² Ø¨Ù?Ø§Ø±Ø¦ Ù?Ù?Ø§Ø³Ø¨ Ù?Ù?Ø³Ø® Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? Ø¥Ù?Ù? Ø§Ù?Ù?Ø§ØªÙ? Ø§Ù?Ù?ØÙ?Ù?Ù? Ø£Ù? Ø£Ø¬Ù?Ø²Ø© Ø£Ø®Ø±Ù?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ø§ Ù?Ù?Ø¬Ø¯ Ø£Ù? bridges Ù?ØªØ§ØØ© ØØ§Ù?Ù?Ø§"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ø±Ø¨Ù?Ø§ ØªØØªØ§Ø¬ Ø¥Ù?Ù? %s Ø§Ù?Ø¹Ù?Ø¯Ø© %s Ù? Ø§Ø®ØªÙ?Ø§Ø± Ù?Ù?Ø¹ bridge Ù?Ø®ØªÙ?Ù?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ø®Ø·Ù?Ø© %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ØÙ?Ù? %s Ù?ØªØµÙ?Ø Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ø®Ø·Ù?Ø© %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ø®Ø·Ù?Ø© %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
@@ -150,27 +164,27 @@ msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ø£Ø¹Ø·Ù?Ù? bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªÙ?Ø¯Ù?Ø©"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ù?Ø§"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ù?Ø§ Ø´Ù?Ø¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÙ?%sØ¹Ù?!"
@@ -178,7 +192,7 @@ msgstr "%sÙ?%sØ¹Ù?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ£%sØµÙ? Ø¹Ù?Ù? Bridges"
@@ -222,7 +236,7 @@ msgstr "Ù?Ø±ØØ¨Ø§Ø? %s "
 msgid "Hello, friend!"
 msgstr "Ù?Ø±ØØ¨Ø§ ,ØµØ¯Ù?Ù?Ù?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ù?Ù?Ø§ØªÙ?Ø Ø¹Ø§Ù?Ø©"
 
@@ -272,7 +286,7 @@ msgid ""
 "\n"
 msgstr "Ø¨Ø§Ù?Ø£Ø¶Ø§Ù?Ø© Ø¥Ù?Ù? Ø°Ù?Ù?Ø? BridgeDB Ù?ØØªÙ?Ù? Ø¹Ù?Ù? bridges %s Ø¹Ø§Ø¯Ù?Ø© Ø¨Ø¯Ù?Ù? Ø£Ù? Pluggable Transports %s ØªØ³ØªØ·Ù?Ø¹ Ø§Ù?Ø¶Ø§ Ø§Ù?Ù?Ø³Ø§Ø¹Ø¯Ø© Ù?Ù? Ø§Ù?ØªØØ§Ù?Ù? Ø¹Ù?Ù? Ø±Ù?Ø§Ø¨Ø© Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù? Ø§Ù?Ù?Ø«Ù?Ø± Ù?Ù? Ø§Ù?Ø§ØÙ?Ø§Ù?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ù?Ø§ Ù?Ù? bridgesØ?"
 
@@ -290,8 +304,8 @@ msgstr "Ø£ØØªØ§Ø¬ Ø¥Ù?Ù? Ù?Ø³Ù?Ù?Ø© Ø¨Ø¯Ù?Ù?Ø© Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¬Ø³Ù?Ø± Ù?Ù? Ø¹Ø¨Ø± Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù?Ù? Ù?Ø¬Ø¨ Ø§Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¹Ø¨Ø± Ø¹Ù?Ù?Ø§Ù? Ø¨Ø±Ù?Ø¯Ù? Ù?Ù? Ø¥ØØ¯Ù? Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø£Ù? %s Ø£Ù? %s."
+"%s or %s."
+msgstr "Ù?Ù?Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges Ù?Ù? Ø§Ù? ØªØ±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù? Ù?Ø¬Ø¨ Ø¥Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø¹Ù?Ù?Ø§Ù? Ù?Ù? Ø£ØØ¯ Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø§Ù? %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -300,54 +314,44 @@ msgstr "bridges Ù?Ø§ ØªØ¹Ù?Ù?! Ø£Ù?Ø§ Ø¨ØØ§Ø¬Ø© Ø¥Ù?Ù? Ù?Ø³Ø§Ø¹Ø¯Ø©!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ù?Ù? ØØ§Ù? Ø¹Ø¯Ù? Ø¹Ù?Ù? Tor, Ø§Ø±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?Ù? %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ØØ§Ù?Ù? Ø§Ù? ØªØªØ¶Ù?Ù? Ø±Ø³Ø§Ù?ØªÙ? Ø¹Ù?Ù? Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ù?Ø«Ù?Ø±Ø© Ø¹Ù? Ù?Ø´Ù?Ù?ØªÙ?Ø? Ø¨Ù?Ø§ Ù?Ù? Ø°Ù?Ù? Ù?Ø§Ø¦Ù?Ø© Ø§Ù?Ù?bridges Ù? Pluggable Transports Ø§Ù?Ø°Ù? ØªØØ§Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù?Ù?Ø? Ù?Ø±Ù?Ù? Ù?Ø³Ø®Ø© Tor Browser Ù?Ø£Ù? Ø±Ø³Ø§Ø¦Ù? Ø§Ø¸Ù?Ø±Ù?Ø§ TorØ? Ø¥Ù?Ø®."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ù?Ø§ Ù?Ù? Ø³Ø·Ù?Ø± Ø§Ù?Ù?Bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ø£ØØµÙ? Ø¹Ù?Ù? Bridges"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ù? Ù?Ø¶Ù?Ù? ØØ¯Ø¯ Ø§Ù?Ø®Ù?Ø§Ø±Ø§Øª Ù?Ù?Ù?Ø¹ Ø§Ù?Ù?bridge"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¥Ù?Ù? %sØ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?ØªØµÙ?ØÙ? Ù?Ø§ Ù?Ø¹Ø±Ø¶ Ø§Ù?ØµÙ?Ø± Ø¨Ø´Ù?Ù? ØµØÙ?Ø"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ø£Ø¯Ø®Ù? Ø§Ù?ØØ±Ù?Ù? Ø£Ù? Ø§Ù?Ø£Ø±Ù?Ø§Ù? Ù?Ù? Ø§Ù?ØµÙ?Ø±Ø© Ø£Ø¹Ù?Ø§Ù? ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ù?Ù?Ù? ØªØ¨Ø¯Ø£ Ø¨Ø§Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?Ù?bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +360,21 @@ msgid ""
 msgstr "Ù?ØªØªÙ?Ù?Ù? Ù?Ù? Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ø¥Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø TorØ? Ø£Ø°Ù?Ø¨ Ø¥Ù?Ù? %s ØµÙ?ØØ© ØªØÙ?Ù?Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø  Tor %s Ù?Ø£ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ù?Ù?Ù?Ø§ Ù?Ù? Ø§Ø¬Ù? ØªØÙ?Ù?Ù? Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ù?ØªØµÙ?Ø  Tor"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ø¹Ù?Ø¯ Ø¸Ù?Ù?Ø± Ø´Ø§Ø´Ø© 'Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© Tor'Ø? Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'ØªÙ?Ù?Ù?Ù?' Ù? Ø§ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª ØØªÙ? ØªØ³Ø£Ù?Ù? Ø¹Ù?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ø²Ù?Ø¯ Ø®Ø¯Ù?Ø© Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª (ISP) Ø§Ù?Ø®Ø§Øµ Ø¨Ù? Ø¨Ù?Ù?Ø¹ Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ø¨Ø´Ø¨Ù?Ø© Tor Ø£Ù? Ù?Ø±Ø§Ù?Ø¨ØªÙ?Ø§ Ø¨Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù?Ø?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -378,28 +382,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ø§Ø®ØªØ§Ø± 'Ù?Ø¹Ù?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? Ø¨Ù?ØµÙ? Ø§Ù?Ù?bridges Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø© Ù?Ù? Ø§Ù?Ù?Ø±Ø¨Ø¹. Ø«Ù? Ø§Ø®ØªØ§Ø± 'Ø§ØªØµØ§Ù?' Ù? Ø§Ø°Ø§ Ù?Ø§Ø¬Ù?ØªÙ? Ù?Ø´Ù?Ù?Ø© Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'Ù?Ø³Ø§Ø¹Ø¯Ø©' Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø§Ø¹Ø¯Ø§Ø¯ Tor."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "ØªØ¸Ù?Ø± Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø©"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ø£Ø·Ù?Ø¨ bridges Ø¹Ø§Ø¯Ù?Ø©."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ø£Ø·Ù?Ø¨ IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ø£Ø·Ù?Ø¨ Pluggable Transport Ø¨Ù? TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? Ù?Ø³Ø®Ø© Ù?Ù? Ù?Ù?ØªØ§Ø GnuPG Ø§Ù?Ø¹Ø§Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù?BridgeDB"
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
index 08aa2088d..d96a0b741 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # D, 2014-2015
 # Emin Mastizada <emin@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: 2018-01-17 21:21+0000\n"
-"Last-Translator: Emin Mastizada <emin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lÄ± nÉ? isÉ? sÉ?hv oldu."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Problemi XÉ?bÉ?r Ver"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "MÉ?nbÉ? Kodu"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "DÉ?yiÅ?ikliklÉ?r"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Æ?laqÉ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "HamÄ±sÄ±nÄ± SeÃ§"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Kodu GÃ¶stÉ?r"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KÃ¶rpÃ¼ sÉ?tirlÉ?riniz Ã¼Ã§Ã¼n QR Kod"
 
@@ -68,58 +82,58 @@ msgstr "KÃ¶rpÃ¼ sÉ?tirlÉ?riniz Ã¼Ã§Ã¼n QR Kod"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Vay dÉ?dÉ?m!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "GÃ¶rÃ¼nÃ¼r QR Kodunuzu almada sÉ?hv yarandÄ±."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Bu QR Kodunda kÃ¶rpÃ¼ sÉ?tirlÉ?riniz var. Bunu QR Kod oxuyucularla gÃ¶zdÉ?n keÃ§irin vÉ? kÃ¶rpÃ¼ sÉ?tirlÉ?rinizi mobil vÉ? digÉ?r cihazlara kÃ¶Ã§Ã¼rÃ¼n."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "HazÄ±rda mÃ¼mkÃ¼n kÃ¶rpÃ¼ yoxdur..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ã?ox gÃ¼man ki, sÉ?n %s geri qayÄ±dÄ±b %s baÅ?qa kÃ¶rpÃ¼ nÃ¶vÃ¼ seÃ§mÉ?li idin!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1-ci%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor SÉ?yyahÄ±nÄ± %s Endir"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2-ci%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶rpÃ¼ %s Æ?ldÉ? Et"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3-cÃ¼%s AddÄ±m"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
@@ -128,27 +142,27 @@ msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? kÃ¶rpÃ¼lÉ?ri ver!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "TÉ?kmillÉ?Å?dirilmiÅ? SeÃ§imlÉ?r"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Xeyr"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "heÃ§ biri"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sB%sÉ?li!"
@@ -156,7 +170,7 @@ msgstr "%sB%sÉ?li!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶rpÃ¼ Æ?ldÉ? Et"
@@ -200,7 +214,7 @@ msgstr "Ey, %s!"
 msgid "Hello, friend!"
 msgstr "Salam, dost!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ä°ctimai AÃ§arlar"
 
@@ -250,7 +264,7 @@ msgid ""
 "\n"
 msgstr "Bundan É?lavÉ? BridgeDB Pluggable Transports %s olmayan bir sÄ±ra darÄ±xdÄ±rÄ±cÄ± \nkÃ¶rpÃ¼lÉ?r %s dÉ? vardÄ±r, amma onlar yenÉ? dÉ? internet senzurasÄ±ndan \nsovuÅ?maÄ?Ä± bacarÄ±rlar.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "KÃ¶rpÃ¼lÉ?r nÉ?dir?"
 
@@ -268,8 +282,8 @@ msgstr "KÃ¶rpÃ¼lÉ?rin É?ldÉ? edilmÉ?sinin alternativ yollarÄ±nÄ± axtarÄ±ram!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "KÃ¶rpÃ¼lÉ?ri É?ldÉ? etmÉ?yin baÅ?qa yolu da %s emailinÉ? mÉ?ktub yazmaqdÄ±r. LÃ¼tfÉ?n, yadÄ±nda\nsaxla ki, email gÃ¶ndÉ?rÉ?n zaman aÅ?aÄ?Ä±dakÄ± email tÉ?min edicilÉ?rindÉ?n birini istifadÉ? etmÉ?lisÉ?n:\n%s, %s vÉ? ya %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "KÃ¶rpÃ¼lÉ?rim iÅ?lÉ?rmir! KÃ¶mÉ?yÉ? ehtiyacÄ±m var!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Æ?gÉ?r Tor iÅ?lÉ?mirsÉ?, sÉ?n %s Ã¼nvanÄ±na yazmalÄ±san."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Yaranan vÉ?ziyyÉ?t haqqÄ±nda É?traflÄ± mÉ?lumat yazmaÄ?a Ã§alÄ±Å?; kÃ¶rpÃ¼lÉ?rin siyahÄ±sÄ± vÉ? \nistifadÉ? etmÉ?yÉ? Ã§alÄ±Å?dÄ±Ä?Ä± Pluggable Transport-un adÄ±, Tor SÉ?yyahÄ±nÄ±n versiyasÄ± vÉ? \nTor tÉ?rÉ?findÉ?n aldÄ±Ä?Ä±n hÉ?r hansÄ± mesaj vÉ? s."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "SÉ?nin kÃ¶rpÃ¼ sÉ?tirlÉ?rin:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "KÃ¶rpÃ¼ Æ?ldÉ? Et!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfÉ?n, kÃ¶rpÃ¼ nÃ¶vlÉ?ri Ã¼Ã§Ã¼n seÃ§imlÉ?ri mÃ¼É?yyÉ?nlÉ?Å?dir:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 Ã¼nvanlara ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "SÉ?nin brauzerin Å?É?killÉ?ri gÃ¶stÉ?rÉ? bilmir."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "YuxarÄ±dakÄ± Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "KÃ¶rpÃ¼lÉ?ri necÉ? istifadÉ? edÉ?cÉ?ksÉ?n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
 msgstr "KÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? etmÉ?k Ã¼Ã§Ã¼n ilk olaraq %s Tor SÉ?yyahÄ±nÄ± endirmÉ?\nsÉ?hifÉ?sinÉ? %s gedin vÉ? daha sonra endirib Tor SÉ?yyahÄ±nÄ± qurmaq Ã¼Ã§Ã¼n oradakÄ±\naddÄ±mlarÄ± izlÉ?yin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "'Tor Å?É?bÉ?kÉ? ParametrlÉ?ri' dialoqu sÄ±Ã§rayÄ±b aÃ§Ä±lsa, 'Konfiqurasiya' dÃ¼ymÉ?sini kliklÉ?\nvÉ? vizardÄ±n dediklÉ?rinÉ? bu sualÄ± verÉ?nÉ? qÉ?dÉ?r riayÉ?t et:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ä°nternet XidmÉ?t TÉ?qdimatÃ§Ä±sÄ± (Ä°XT) sÉ?nin Tor Å?É?bÉ?kÉ?sinÉ? giriÅ?ini kilidlÉ?yir vÉ? ya \nÉ?laqÉ?lÉ?rÉ? mÉ?hdudiyyÉ?tlÉ?r qoyur?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -356,28 +360,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Æ?vvÉ?l 'BÉ?li' vÉ? daha sonra 'NÃ¶vbÉ?ti'-ni seÃ§. Yeni kÃ¶rpÃ¼lÉ?rini konfiqurasiya \netmÉ?k Ã¼Ã§Ã¼n kÃ¶rpÃ¼ sÉ?tirlÉ?rini kÃ¶Ã§Ã¼r vÉ? idxal qutusuna yapÄ±Å?dÄ±r. Æ?n son olaraq, \n'Æ?laqÉ? Yarat' dÃ¼ymÉ?sini kliklÉ? vÉ? mÉ?ncÉ? indi davam etmÉ?k Ã¼Ã§Ã¼n yaxÅ?Ä± vaxtdÄ±r! \nHÉ?r hansÄ± problemlÉ? Ã¼zlÉ?Å?sÉ?n, dÉ?stÉ?k Ã¼Ã§Ã¼n 'Tor Å?É?bÉ?kÉ? ParametrlÉ?ri' vizardÄ±nda \n'KÃ¶mÉ?k' dÃ¼ymÉ?sini kliklÉ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Bu mesajÄ± gÃ¶stÉ?rir."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Vanil kÃ¶rpÃ¼ xahiÅ? et."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶rpÃ¼ xahiÅ? et."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE-a gÃ¶rÉ? Pluggable Transport xahiÅ? et."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB-nin ictimai GnuPG aÃ§arÄ±nÄ±n Ã¼zÃ¼nÃ¼ É?ldÉ? et."
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index c6f778174..74a1aff67 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Aleh Ladutska <lad-oleg@xxxxxxxxx>, 2014
 # Ulad L, 2018-2019
 # StanislaÅ Silkin <moonblr29@xxxxxxxxx>, 2016
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-02 16:51+0000\n"
-"Last-Translator: Ulad L\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ñ?Ð±Ð°Ñ?Ð°Ð¹Ñ?Ðµ! Ð¨Ñ?Ð¾Ñ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¹Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð¿Ð°Ð´Ñ?Ð°Ñ? Ð°Ð´Ð¿Ñ?Ð°Ñ?ÐºÑ? Ð²Ð°Ñ?Ð°Ð³Ð° Ð·Ð°Ð¿Ñ?Ñ?Ð°."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð?Ð°Ð²ÐµÐ´Ð°Ð¼iÑ?Ñ? Ð¿Ñ?Ð° Ð±Ð°Ð³."
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð½Ñ?Ñ?Ð½Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ð·Ð¼ÐµÐ½Ð°Ñ?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð¡Ñ?Ð²Ñ?Ð·Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð±Ñ?Ð°Ñ?Ñ? Ð£Ñ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ð¹ Ð¼Ð°Ñ?Ñ?Ð¾Ñ?"
 
@@ -69,58 +83,58 @@ msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ð¹ Ð¼Ð°Ñ?Ñ?Ð¾Ñ?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð?Ð¾Ð¹, Ð±Ð¾Ð¶Ñ?Ñ?Ð½Ð°!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð´Ð°ÐµÑ?Ñ?Ð°, Ð°Ð´Ð±Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð°Ð¼Ñ?Ð»ÐºÐ° Ð¿Ð°Ð´Ñ?Ð°Ñ? Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ð½Ð½Ñ? Ð?Ð°Ñ?Ð°Ð³Ð° QR-ÐºÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ñ?Ñ?Ñ? QR-ÐºÐ¾Ð´ Ñ?Ñ?Ñ?Ñ?Ð¼Ð»Ñ?Ð²Ð°Ðµ Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?. Ð?Ñ?Ð°Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ñ?Ð³Ð¾ Ð¿Ñ?Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð·Ðµ Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ñ?ÐºÐ° QR-ÐºÐ¾Ð´Ð°Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð³Ð¾, ÐºÐ°Ð± Ñ?ÐºÐ°Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? Ð½Ð° Ð¼Ð°Ð±Ñ?Ð»Ñ?Ð½Ñ?Ñ? Ñ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð°Ð´Ñ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð´Ð·ÐµÐ½Ñ? Ð¼Ð¾Ð¼Ð°Ð½Ñ? Ð½Ñ?Ð¼Ð° Ð´Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð°Ð³Ñ?Ñ?Ð¼Ð°, Ð²Ð°Ð¼ Ñ?Ñ?Ñ?Ð±Ð° Ð¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ð°Ð²Ð°Ñ?Ñ? %s Ð²Ñ?Ñ?Ð½Ñ?Ñ?Ñ?Ð° Ð½Ð°Ð·Ð°Ð´ %s Ñ? Ð°Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð½Ñ?Ñ? Ñ?Ñ?Ð¿ Ð¼Ð°Ñ?Ñ?Ð°."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡Ð¿Ð°Ð¼Ð¿Ñ?Ð¹Ñ?Ðµ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? %s Ð¼Ð°Ñ?Ñ?Ñ? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¦Ñ?Ð¿ÐµÑ? %s Ð´Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ñ? Tor Browser %s"
@@ -129,27 +143,27 @@ msgstr "Ð¦Ñ?Ð¿ÐµÑ? %s Ð´Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ñ? Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð° Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð½Ðµ Ð³Ñ?Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð´Ð°Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ð?Ð°Ð»Ð°Ð´Ñ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð½Ñ?Ð¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -157,7 +171,7 @@ msgstr "%sÐ¢%sÐ°Ðº!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð?Ð°Ñ?Ñ?Ñ?"
@@ -201,7 +215,7 @@ msgstr "Ð?Ñ?Ñ?Ð²Ñ?Ñ?Ð°Ð½Ð½Ðµ, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ñ?Ð°Ñ?, Ñ?Ñ?Ð±Ñ?Ð°!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð±Ð»Ñ?Ñ?Ð½Ñ?Ñ? Ð?Ð»Ñ?Ñ?Ñ?"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "Ð¢Ð°ÐºÑ?Ð°Ð¼Ð° Ð¼Ð°Ñ?Ñ?Ñ? BridgeDB Ð¼Ð°Ñ?Ñ?Ñ? Ð¼Ð½Ð¾Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? %s, Ñ?ÐºÑ?Ñ? Ð½Ðµ Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ñ? Ð¿ÐµÑ?Ð°Ð´Ð°Ñ?Ñ? Ð´Ð°Ð´Ð·ÐµÐ½Ð½Ñ?Ñ?\nPluggable Transports %s. Ð?Ñ?Ñ?Ð° Ð³Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ðµ Ð²ÐµÐ»Ñ?Ð¼Ñ? Ð´Ð¾Ð±Ñ?Ð°, Ñ? Ð¼Ð¾Ð¶Ð° Ð¿Ð°Ñ?Ð¿Ð»Ñ?Ð²Ð°Ñ?Ñ? Ð½Ð° Ñ?Ð¾Ðµ, Ñ?Ðº Ð°Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ð° Ñ?Ð°Ð¹Ñ?Ñ?, Ð°Ð´Ð½Ð°Ðº Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ðº Ñ? Ñ?Ð°Ð½ÐµÐ¹,\nÐ´Ð°Ð¿Ð°Ð¼Ð°Ð³Ð°Ñ?Ñ?Ñ? Ð°Ð±Ñ?Ñ?Ð¾Ð´Ð·Ñ?Ñ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?-Ñ?Ñ?Ð½Ð·Ñ?Ñ?Ñ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð¾ Ð·Ð° Ð¼Ð°Ñ?Ñ?Ñ??"
 
@@ -269,8 +283,8 @@ msgstr "Ð?Ð½Ðµ Ñ?Ñ?Ñ?Ð±Ð° Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?Ðº-Ð½ÐµÐ±Ñ?Ð´Ð·Ñ? Ñ?Ñ?Ñ?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ð½Ñ?Ñ? Ñ?Ð¿Ð¾Ñ?Ð°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ñ?Ð¿Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? â?? Ð´Ð°Ñ?Ð»Ð°Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ? Ð»Ñ?Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?Ð°Ñ? %s. Ð?Ð²Ñ?Ñ?Ð½Ñ?Ñ?Ðµ Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ñ?Ð¾ Ð²Ñ? Ð¼Ñ?Ñ?Ñ?Ñ?Ðµ\nÐ´Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð»Ñ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÑ? Ð· Ð°Ð´Ð½Ð°Ð³Ð¾ Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? e-mail Ñ?Ñ?Ð²Ñ?Ñ?Ð°Ñ?:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Ð?Ð°Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð°Ñ?Ñ?Ñ?Ð±Ð½Ð°Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ð°Ð»Ñ? Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ðµ, Ð·Ð²Ñ?Ñ?Ð½Ñ?Ñ?ÐµÑ?Ñ? Ð¿Ð° e-mail Ð°Ð´Ñ?Ð°Ñ?Ðµ %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð£ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ? Ð¿Ð°Ñ?Ñ?Ð°Ñ?Ð°Ð¹Ñ?ÐµÑ?Ñ? Ð´Ð°Ñ?Ñ? Ñ?Ðº Ð¼Ð°Ð³Ð° Ð±Ð¾Ð»Ñ?Ñ? Ñ?Ð½Ñ?Ð°Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð° Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ñ?, Ñ?ÐºÐ»Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð¼Ñ? Ð¼Ð°Ñ?Ñ?Ð° Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?, Ñ?ÐºÐ¾Ðµ Ð²Ñ? Ð²Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ð»Ñ? Ð´Ð»Ñ? Ð¿ÐµÑ?Ð°Ð´Ð°Ñ?Ñ? Ð´Ð°Ð´Ð·ÐµÐ½Ð½Ñ?Ñ?, Ð° Ñ?Ð°ÐºÑ?Ð°Ð¼Ð° Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Tor. "
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð°Ð»Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð°Ð±Ñ?Ñ?Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ð´Ñ? Ð´Ð»Ñ? Ñ?Ñ?Ð¿Ñ? Ð¼Ð°Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ IPv6 Ð°Ð´Ñ?Ð°Ñ?Ñ??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Ð°Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ðµ Ð²Ñ?Ñ?Ð²Ñ? Ð½ÐµÐºÐ°Ñ?Ñ?ÐºÑ?Ð½Ð°."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð²Ñ?Ð´Ð·Ñ?Ñ?Ðµ Ñ?Ñ?Ð¼Ð²Ð°Ð»Ñ? Ð· Ð²Ñ?Ñ?Ð²Ñ?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð°Ñ?Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð¼Ð°Ñ?Ñ?Ð°Ð¼Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "Ð?Ð°Ð± Ð´Ð°Ð´Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ? Ð¼Ð¾Ñ?Ñ? Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Tor,  Ñ?Ñ?Ñ?Ð±Ð° Ð¿ÐµÑ?Ð°Ð¹Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ñ?Ð¾Ð½ÐºÑ? Ñ?Ð¿Ð°Ð¼Ð¿Ð¾Ñ?Ð²Ð°Ð½Ð½Ñ? %s Tor Browser\n %s Ñ? Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ð¹ Ð¿Ð° Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ñ?Ñ?Ñ?\nÐ±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð°Ð»Ñ? Ð²Ñ?Ñ?ÐºÐ°ÐºÐ½Ðµ Ð´Ð°Ñ?Ð»Ð¾Ð³Ð°Ð²Ð°Ðµ Ð²Ð°ÐºÐµÐ½Ñ?Ð° \"Ð¡ÐµÑ?ÐºÐ°Ð²Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Tor\", Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ?\" Ñ? ÐºÑ?Ñ?Ñ?Ð¹Ñ?ÐµÑ?Ñ?\nÐ¿Ñ?Ð°Ð³Ñ?Ð°Ð¼Ð°Ð¹ Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ñ?ÐºÑ?, Ð¿Ð°ÐºÑ?Ð»Ñ? Ñ?Ð½Ð° Ð½Ðµ Ñ?Ð¿Ñ?Ñ?Ð°Ðµ:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð¦Ñ? Ð±Ð»Ð°ÐºÑ?Ðµ Ð²Ð°Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?-Ð¿Ñ?Ð°Ð²Ð°Ð¹Ð´Ñ?Ñ? Ð·Ð»Ñ?Ñ?Ñ?Ð½Ð½Ðµ Ð· Ñ?ÐµÑ?ÐºÐ°Ð¹ Tor, Ð°Ð»Ñ?Ð±Ð¾ Ñ?Ðº-Ð½ÐµÐ±Ñ?Ð´Ð·Ñ?\nÐ¿Ð°-Ñ?Ð½Ñ?Ð°Ð¼Ñ? Ñ?Ñ?Ð½Ð·Ñ?Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ð³Ð¾?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð±Ñ?Ñ?Ñ?Ñ?Ðµ \"Ð¢Ð°Ðº\" Ð° Ð·Ð°Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð°Ð»ÐµÐ¹\". Ð?Ð°Ð± Ð½Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?ÐºÐ°Ð¿Ñ?Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÑ?Ñ?Ñ?Ð°Ñ?Ñ?Ðµ Ñ?Ð°Ð´ÐºÑ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? Ñ? Ñ?Ñ?ÐºÑ?Ñ?Ð°Ð²Ð°Ðµ Ð²Ð°ÐºÐµÐ½Ñ?Ð°. Ð?Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ð°\"\nÑ? Ð¼Ð¾Ð¶Ð°Ñ?Ðµ Ð¿Ð°Ñ?Ñ?Ð½Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð°Ð¼. Ð?Ð°Ð»Ñ? Ð²Ñ? Ñ?Ñ?Ñ?Ñ?ÐºÐ½Ñ?Ð»Ñ?Ñ?Ñ? Ð· Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ð°Ð¼Ñ?,\nÐ¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°\" Ñ? Ð²Ð°ÐºÐµÐ½Ñ?Ñ? \"Ð¡ÐµÑ?ÐºÐ°Ð²Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Tor\" ÐºÐ°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼ÐºÑ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð³Ñ?Ñ?Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ? Ð½Ð° Pluggable Transport Ð°Ð´ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¿Ñ?Ñ? Ð¿Ñ?Ð±Ð»Ñ?Ñ?Ð½Ð°Ð³Ð° GnuPG-ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index 248a3a992..bae95a413 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # aramaic <aramaicbg@xxxxxxxxx>, 2015
 # Kaloyan Nikolov <kotipuka01@xxxxxxxxx>, 2016
 # Maxi <kutia0001@xxxxxxxxx>, 2015
@@ -12,17 +11,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð¡Ñ?Ð¶Ð°Ð»Ñ?Ð²Ð°Ð¼Ðµ! Ð?ÐµÑ?Ð¾ Ñ?Ðµ Ð¾Ð±Ñ?Ñ?ÐºÐ° Ñ? Ð·Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð²Ð¸."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð?Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð¡Ð¾Ñ?Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð·Ð±eÑ?Ð¸ Ð²Ñ?Ð¸Ñ?ÐºÐ¾"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR Ð?Ð¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Ð?Ð¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð»Ð¸Ð½Ð¸Ð¸"
 
@@ -70,58 +84,58 @@ msgstr "QR Ð?Ð¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð»Ð¸Ð½Ð¸Ð¸"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð?Ð¾Ð¾, Ñ?Ð¿Ð°Ð³ÐµÑ?ÐºÐ¸!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ðµ Ð¸Ð¼Ð°Ð»Ð¾ Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ð°Ñ?Ð¸Ñ? QR Ð?Ð¾Ð´."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð¢Ð¾Ð·Ð¸ QRCode Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸. Ð¡ÐºÐ°Ð½Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð³Ð¾ Ñ? QR Ð?Ð¾Ð´ Ñ?ÐµÑ?ÐµÑ? Ð´Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸ ÐºÑ?Ð¼ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ bridges ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð°Ð¹ Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° %s Ñ?Ðµ Ð²Ñ?Ñ?Ð½ÐµÑ?Ðµ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ð·Ð»Ð¸Ñ?ÐµÐ½t bridge Ñ?Ð¸Ð¿!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡Ð²Ð°Ð»Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð·ÐµÐ¼Ð¸ %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
@@ -130,27 +144,27 @@ msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð¼Ð¸ Ð´Ð°Ð¹Ñ?Ðµ bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð Ð°Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°!"
@@ -158,7 +172,7 @@ msgstr "%sÐ?%sÐ°!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ·ÐµÐ¼Ð¸ Bridges"
@@ -202,7 +216,7 @@ msgstr "Ð¥ÐµÐ¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²ÐµÐ¹, Ð¿Ñ?Ð¸Ñ?Ñ?ÐµÐ»!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ ÐºÐ»Ñ?Ñ?"
 
@@ -252,7 +266,7 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ· Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸\nPluggable Transports %s ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ? Ñ?Ð¾Ð»ÐºÐ¾Ð²Ð° Ð´Ð¾Ð±Ñ?Ðµ, Ð½Ð¾ Ð²Ñ?Ðµ Ð¿Ð°Ðº Ð¼Ð¾Ð³Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð² Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð?Ð°ÐºÐ²Ð¾ Ñ?Ð° bridges?"
 
@@ -270,8 +284,8 @@ msgstr "Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° bridges Ðµ Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s. Ð?Ð¾Ð»Ñ? Ð¾Ñ?Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ, Ñ?Ðµ Ð²Ð¸Ðµ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð°\nÐ¸Ð·Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÐºÐ¸ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° ÐµÐ´Ð¸Ð½ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ñ?Ð¸:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Ð?Ð¾Ð¸Ñ?Ðµ bridges Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ?! Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð¿Ð¾Ð¼
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ð²Ð°Ñ?Ð¸Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð»ÐºÐ¾Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹, Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ñ?Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð°\nbridges Ð¸ Pluggable Transports ÐºÐ¾Ð¸Ñ?Ð¾ Ñ?Ñ?Ðµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸, Ð²Ð°Ñ?Ð°Ñ?Ð° Tor Browser Ð²ÐµÑ?Ñ?Ð¸Ñ?,\nÐ¸ Ð²Ñ?Ñ?ÐºÐ¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ñ? ÐºÐ¾ÐµÑ?Ð¾ Tor Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ð», Ð¸ Ñ?.Ð½."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð¢Ñ?Ñ? Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð²Ñ?Ñ?Ð·ÐºÐ¸:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ð·ÐµÐ¼ÐµÑ?Ðµ Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ñ? Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð¸Ð´ bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð·Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ñ?Ðµ Ð¾Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð¾Ñ? Ð³Ð¾Ñ?Ðµ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
 msgstr "Ð?Ð° Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° bridges Ð² Tor Browser, Ð¿Ñ?Ñ?Ð²Ð¾ Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° \n%s Tor Browser Ñ?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ %s Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° \nÑ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð¾ 'Tor Network Settings' Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ? Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸, ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Configure' Ð¸ Ñ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ\nÑ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ð½Ðµ Ð¿Ð¾Ð¿Ð¸Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð¦ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð»Ð¸ Ð¸Ð»Ð¸ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð²Ð¸ Ð²Ð°Ñ?Ð¸Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº (ISP)\nÐ´Ð¾ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -358,28 +362,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð°Ð¿Ñ?ÐµÐ´'. Ð?Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ bridges, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¸\nÐ¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ bridge Ñ?ÐµÐ´Ð¾Ð²ÐµÑ?Ðµ Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾ Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ. Ð?Ð° ÐºÑ?Ð°Ñ? Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ 'Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ', Ð¸\nÑ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð´Ð½Ð¾Ñ?Ñ?Ð¸, Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?' Ð±Ñ?Ñ?Ð¾Ð½Ð° Ð²  'Tor Network Settings' Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸ÐµÑ?Ð¾."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸ bridges."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ñ?Ð²Ð¸ IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ñ?Ð²Ð¸ Pluggable Transport Ñ?Ð¿Ð¾Ñ?ÐµÐ´ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ð·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ðµ Ð½Ð° BridgeDB's Ð¾Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ GnuPG ÐºÐ»Ñ?Ñ?."
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 1cdc0286f..6b9e403bb 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # code smite <codesmite@xxxxxxxxx>, 2018
 # Humayun Rashid <reporterhr@xxxxxxxxx>, 2019
 # Mahmud Numan <mahmudnuman@xxxxxxxxx>, 2016-2017
@@ -14,17 +13,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-25 11:00+0000\n"
-"Last-Translator: Tasneem Khalil <tasneem.khalil@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¦¦à§?à¦?à¦?à¦¿à¦¤! à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§à§? à¦?à¦¿à¦?à§? à¦à§?à¦² à¦¹à¦¯à¦¼à§?à¦?à§?à¥¤"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à¦?à¦?à¦?à¦¿ à¦¤à§?à¦°à§?à¦?à¦¿ à¦°à¦¿à¦ªà§?à¦°à§?à¦? à¦?à¦°à§?à¦¨"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à¦¸à§?à¦°à§?à¦¸ à¦?à§?à¦¡"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨à§?à¦° à¦¤à¦¾à¦²à¦¿à¦?à¦¾"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¦¯à§?à¦?à¦¾à¦¯à§?à¦?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¦¸à¦¬ à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR à¦?à§?à¦¡ à¦¦à§?à¦?à§?à¦¨"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦²à¦¾à¦?à¦¨ à¦?à¦¨à§?à¦¯ QR à¦?à§?à¦¡"
 
@@ -72,58 +86,58 @@ msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦²à¦¾à¦?à¦¨ à¦?à¦¨à§?à¦¯ QR à¦?à§?à¦¡"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à¦§à§?à¦°! à¦?à§?à¦¥à¦¾à§? à¦¯à§?à¦¨à§? à¦?à¦¾à¦®à§?à¦²à¦¾ à¦¹à¦?à§?à¦?à§?"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¦®à¦¨à§? à¦¹à¦?à§?à¦?à§? à¦?à¦ªà¦¨à¦¾à¦° â??QR à¦?à§?à¦¡ à¦ªà§?à¦¤à§? à¦?à§?à¦¥à¦¾à¦? à¦?à¦¾à¦®à§?à¦²à¦¾ à¦¹à§?à§?à¦?à§?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¦?à¦? QR à¦?à§?à¦¡à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¦à§?à§?à¦¾ à¦?à¦?à§?, à¦®à§?à¦¬à¦¾à¦?à¦² à¦?à¦¥à¦¬à¦¾ à¦¯à§?à¦?à§?à¦¨ à¦¡à¦¿à¦à¦¾à¦?à¦¸à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦?à¦ªà¦¿ à¦?à¦°à¦¤à§? à¦?à¦? QR à¦?à§?à¦¡ à¦?à§?à¦?à§? à¦¸à§?à¦?à§?à¦¯à¦¾à¦¨ à¦?à¦°à§?à¦¨ à¥¤"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦?à§?à¦¨ à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¸à¦¹à¦?à¦²à¦à§?à¦¯ à¦¨à§?à¦?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¦¹à§?à¦¤à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¿à§? %s à¦¤à§? à¦«à¦¿à¦°à§? à¦¯à¦¾à¦?à§?à¦¾ à¦?à¦¬à¦?  %s à¦à¦¿à¦¨à§?à¦¨ à¦§à¦°à§?à¦®à§? à¦¸à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à¦¾ "
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¦§à¦¾à¦ª %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¦§à¦¾à¦ª %s 2 %s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¦?à§?à¦? %s à¦¬à§?à¦°à¦¿à¦?  %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¦§à¦¾à¦ª %s 3 %s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¦?à¦?à¦¨ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦¯à§?à¦?à§?à¦¤ à¦?à¦°à§?à¦¨%s"
@@ -132,27 +146,27 @@ msgstr "à¦?à¦?à¦¨ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦¯à§?
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ %s à¦?à¦®à¦¾à¦?à§? à¦¶à§?à¦§à§?  à¦¬à§?à¦°à¦¿à¦? à¦¦à¦¾à¦?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à¦?à¦¨à§?à¦¨à¦¤ à¦¬à¦¿à¦?à¦²à§?à¦ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à¦¨à¦¾"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à¦?à§?à¦¨à§?à¦?à¦¾ à¦¨à¦¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s %s à¦¹à§?à¦¯à¦¾à¦?"
@@ -160,7 +174,7 @@ msgstr "%s %s à¦¹à§?à¦¯à¦¾à¦?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
@@ -204,7 +218,7 @@ msgstr "à¦?à¦°à§?, %s!"
 msgid "Hello, friend!"
 msgstr "à¦?à¦¹à§? à¦¬à¦¨à§?à¦§à§?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¦ªà¦¾à¦¬à¦²à¦¿à¦? à¦?à§?"
 
@@ -254,7 +268,7 @@ msgid ""
 "\n"
 msgstr "à¦?à¦ªà¦°à¦¨à§?à¦¤à§?, à¦¬à§?à¦°à¦¿à¦?à¦¡à¦¿à¦¬à¦¿ à¦?à¦° à¦®à¦§à§?à¦¯à§? à¦ªà§?à¦°à¦?à§?à¦° à¦ªà§?à¦²à§?à¦?à¦¨-à¦à§?à¦¯à¦¾à¦²à¦¿-à¦à§?à¦¯à¦¾à¦¨à¦¿à¦²à¦¾ à¦¬à§?à¦°à¦¿à¦? %s à¦°à¦¯à¦¼à§?à¦?à§?\nà¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦? %s à¦¯à¦¾ à¦¹à¦¯à¦¼à¦¤à§? à¦ à¦¾à¦¨à§?à¦¡à¦¾ à¦¬à¦²à§? à¦®à¦¨à§? à¦?à¦°à§? à¦¨à¦¾, à¦¤à¦¬à§? à¦¤à¦¾à¦°à¦¾ à¦?à¦?à¦¨à¦? à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?\nà¦?à¦¨à§?à¦? à¦?à§?à¦·à§?à¦¤à§?à¦°à§? à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦¸à§?à¦¨à§?à¦¸à¦°à¦¶à¦¿à¦ªà¦?à§? à¦¬à¦¾à¦§à¦¾ à¦¦à¦¿à¦¤à§? à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "à¦¬à§?à¦°à¦¿à¦? à¦?à¦¿ ?"
 
@@ -272,8 +286,8 @@ msgstr "à¦¬à§?à¦°à¦¿à¦?à§?à¦° à¦¬à§?à¦¯à¦¬à¦¸à§?à¦¥à¦¾ à¦?à¦°à¦¾à¦° à¦?à¦?à¦?à¦¾
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦¤à§? à¦?à¦°à§?à¦?à¦?à¦¿ à¦?à¦ªà¦¾à¦¯à¦¼ à¦¹à¦² %s à¦¥à§?à¦?à§? à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦² à¦ªà¦¾à¦ à¦¾à¦¨à§?à¥¤ à¦¦à¦¯à¦¼à¦¾ à¦?à¦°à§? à¦®à¦¨à§? à¦°à¦¾à¦?à¦¬à§?à¦¨ à¦¯à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦¬à¦¶à§?à¦¯à¦?\nà¦¨à¦¿à¦®à§?à¦¨à§?à¦?à§?à¦¤ à¦?à¦®à§?à¦² à¦ªà§?à¦°à¦¦à¦¾à¦¨à¦?à¦¾à¦°à§?à¦¦à§?à¦° à¦®à¦§à§?à¦¯à§? à¦?à¦?à¦?à¦¿ à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§? à¦?à¦®à§?à¦² à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¹à¦¬à§?: %s\n, %s à¦¬à¦¾ %sà¥¤"
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "à¦?à¦®à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦? à¦?à¦°à¦?à§? à¦¨à¦¾! à¦?à¦®à¦¾à¦°
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¾à¦° Tor à¦?à¦¾à¦? à¦¨à¦¾ à¦?à¦°à§?, à¦¤à¦¬à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦² à¦?à¦°à¦¾ à¦?à¦?à¦¿à§? %sà¥¤"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à¦¤à¦¾à¦²à¦¿à¦?à¦¾à¦?à¦¿ à¦¸à¦¹ à¦?à¦ªà¦¨à¦¾à¦° à¦?à§?à¦¸ à¦¹à¦¿à¦¸à¦¾à¦¬à§? à¦¯à¦¤à¦?à¦¾ à¦¤à¦¥à§?à¦¯ à¦?à¦¨à§?à¦¤à¦°à§?à¦à§?à¦?à§?à¦¤ à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨,\nà¦¸à§?à¦¤à§? à¦?à¦¬à¦? à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦«à¦°à§?à¦®à¦?à§?à¦²à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦?à§?à¦¨, à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§?à¦° à¦¸à¦?à¦¸à§?à¦?à¦°à¦£,\nà¦?à¦¬à¦? à¦?à¦° à¦¦à¦¿à¦¯à¦¼à§?à¦?à§?à¦¨ à¦?à¦®à¦¨ à¦?à§?à¦¨ à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦?à¦¤à§?à¦¯à¦¾à¦¦à¦¿à¥¤"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦?à¦?à§?à¦²à¦¿:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦?à¦ª à¦?à¦° à¦?à¦¨à§?à¦¯ à¦¬à¦¿à¦?à¦²à§?à¦ª à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¿ IPv6 à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¦?à¦ªà¦¨à¦¿ à¦?à¦¿ à¦?à¦?à¦?à¦¿ %s à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¸à¦ à¦¿à¦?à¦à¦¾à¦¬à§? à¦?à¦®à§?à¦? à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¨ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼ à¦¨à¦¾à¥¤"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "à¦?à¦ªà¦°à§?à¦° à¦?à¦¿à¦¤à§?à¦° à¦¥à§?à¦?à§? à¦?à¦?à§?à¦·à¦° à¦?à§?à¦²à¦¿ à¦²à¦¿à¦?à§?à¦¨ ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à¦?à¦¿à¦à¦¾à¦¬à§? à¦¬à§?à¦°à¦¿à¦? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦¶à§?à¦°à§? à¦?à¦°à¦¬à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
 msgstr "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦°à¦¬à§?à¦¶ à¦?à¦°à¦¤à§?, à¦ªà§?à¦°à¦¥à¦®à§? %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨\nà¦ªà§?à¦·à§?à¦ à¦¾ %s à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦¬à¦? à¦¶à§?à¦°à§? à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦¸à§?à¦?à¦¾à¦¨à§? à¦¨à¦¿à¦°à§?à¦¦à§?à¦¶à¦¾à¦¬à¦²à§? à¦?à¦¨à§?à¦¸à¦°à¦£ à¦?à¦°à§?à¦¨\nà¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "à¦¯à¦?à¦¨ 'à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸' à¦¸à¦?à¦²à¦¾à¦ª à¦ªà¦ª à¦?à¦ª, 'à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦°' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦?à¦¨à§?à¦¸à¦°à¦£ à¦?à¦°à§?à¦¨\nà¦?à¦?à¦?à¦¾à¦°à§?à¦¡ à¦¯à¦¤à¦?à§?à¦·à¦£ à¦¨à¦¾ à¦?à¦¿à¦?à§?à¦?à¦¾à¦¸à¦¾ à¦?à¦°à§?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦¸à¦¾à¦°à§?à¦à¦¿à¦¸ à¦ªà§?à¦°à§?à¦à¦¾à¦?à¦¡à¦¾à¦° (à¦?à¦?à¦?à¦¸à¦ªà¦¿) à¦¬à§?à¦²à¦? à¦¬à¦¾ à¦?à¦¨à§?à¦¯à¦¥à¦¾à¦¯à¦¼ à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¨à§?à¦¸à¦° à¦?à¦°à§? à¦¨à¦¾\nà¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¥à§?à¦?à§??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -360,28 +364,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à¦¹à§?à¦¯à¦¾à¦?' à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° 'à¦ªà¦°à¦¬à¦°à§?à¦¤à§?' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦ªà¦¨à¦¾à¦° à¦¨à¦¤à§?à¦¨ à¦¸à§?à¦¤à§? à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦° à¦?à¦°à¦¤à§?, à¦?à¦ªà¦¿ à¦?à¦¬à¦?\nà¦?à§?à¦?à§?à¦¸à¦? à¦?à¦¨à¦ªà§?à¦? à¦¬à¦¾à¦?à§?à¦¸à§? à¦¸à§?à¦¤à§? à¦²à¦¾à¦?à¦¨ à¦?à¦?à¦?à¦¾à¦¨à¥¤ à¦?à¦¬à¦¶à§?à¦·à§?, 'à¦¸à¦?à¦¯à§?à¦?à§?à¦¤' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨, à¦?à¦¬à¦?\nà¦?à¦ªà¦¨à¦¿ à¦¯à§?à¦¤à§? à¦à¦¾à¦² à¦¹à¦¤à§? à¦¹à¦¬à§?! à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦¯à¦¼ à¦ªà¦¡à¦¼à§?à¦¨ à¦¤à¦¬à§? 'à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨\nà¦?à¦°à¦? à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾ à¦?à¦¨à§?à¦¯ 'à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸' à¦?à¦?à¦?à¦¾à¦°à§?à¦¡ à¦®à¦§à§?à¦¯à§? à¦¬à¦¾à¦?à¦¨"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à¦?à¦? à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¿à¦¤ à¦?à¦°à§?"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "à¦à§?à¦¯à¦¾à¦¨à¦¿à¦²à¦¾ à¦¬à§?à¦°à§?à¦?à¦¸à¦®à§?à¦¹à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 à¦¬à§?à¦°à¦¿à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE à¦¦à§?à¦¬à¦¾à¦°à¦¾ à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB à¦?à¦° à¦¸à¦¾à¦°à§?à¦¬à¦?à¦¨à§?à¦¨ GnuPG à¦?à§?-à§?à¦?à¦° à¦?à¦?à¦?à¦¿ à¦?à¦¨à§?à¦²à¦¿à¦ªà¦¿ à¦ªà¦¾à¦¨à¥¤"
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index 34fda4286..678c09a79 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Amar Memisevic <factoryamar@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-09-05 21:29+0000\n"
-"Last-Translator: Amar Memisevic <factoryamar@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Izvini! NeÅ¡to je poÅ¡lo po zlu sa vaÅ¡im zahtevom."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Prijavi greÅ¡ku"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Izvorni kod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Promjene"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "OznaÄ?i sve"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PrikaÅ¾i QR kod"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kod za vaÅ¡u briÄ? liniju"
 
@@ -67,58 +81,58 @@ msgstr "QR kod za vaÅ¡u briÄ? liniju"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, Å¡pagete!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ä?ini se da je doÅ¡lo do pogreÅ¡ke prilikom dostavljanja vaÅ¡eg QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ovaj QRCode sadrÅ¾i linije briÄ?a. Skenirajte ga QRCode Ä?itaÄ?em kako biste kopirali svoje briÄ?eve linije na mobilne i druge ureÄ?aje."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno nema dostupnih briÄ?eva ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾da biste trebali pokuÅ¡ati %s vratiti se %s i odabrati drugu vrstu mosta!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Korak %s 1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Preuzmi %s Tor PretraÅ¾ivaÄ? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Korak %s2%s "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Uzmi %s briÄ? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sada %s dodajte briÄ?eve Tor pretraÅ¾ivaÄ?u %s"
@@ -127,27 +141,27 @@ msgstr "Sada %s dodajte briÄ?eve Tor pretraÅ¾ivaÄ?u %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo mi daj briÄ?eve!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Napredne Opcije"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "NiÅ¡ta"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sDa%s!"
@@ -155,7 +169,7 @@ msgstr "%sDa%s!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sU%szmi BriÄ?eve"
@@ -199,7 +213,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Zdravo, prijatelju!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni KljuÄ?evi"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr ""
 
@@ -267,7 +281,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index e7c74f758..251f9568f 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Albert <provisionalib@xxxxxxxxxxx>, 2013
 # Assumpta <assumptaanglada@xxxxxxxxx>, 2014
 # Eloi GarcÃa i Fargas, 2014
@@ -15,17 +14,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Quelcom ha anat malament amb la peticiÃ³."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Comunica un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Codi font"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Registre de canvis"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacte"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostra el codi QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Codi QR per les lÃnies de ponts"
 
@@ -73,58 +87,58 @@ msgstr "Codi QR per les lÃnies de ponts"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Vatua l'olla!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Hi ha hagut un error en obtenir el codi QR"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mÃ²bil i a altres dispositius. "
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "No hi ha ponts disponibles en aquests moments."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Pas %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descarrega %s Navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Pas %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Descarrega %s ponts %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pas %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ara %s adjunta els ponts al Tor Browser %s"
@@ -133,27 +147,27 @@ msgstr "Ara %s adjunta els ponts al Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust donem els meus bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opcions AvanÃ§ades"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Cap"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ!"
@@ -161,7 +175,7 @@ msgstr "%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sescarrega Bridges"
@@ -205,7 +219,7 @@ msgstr "Hola, %s!"
 msgid "Hello, friend!"
 msgstr "Hola, amic!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claus PÃºbliques"
 
@@ -255,7 +269,7 @@ msgid ""
 "\n"
 msgstr "A mÃ©s a mÃ©s, BridgeDB tÃ© molts ponts %s estÃ ndard sense \nPluggable Transports %s, que potser no sÃ³n tan interessants, perÃ² que tambÃ©\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "QuÃ¨ sÃ³n els ponts?"
 
@@ -273,8 +287,8 @@ msgstr "Em cal una manera alternativa d'obtenir ponts."
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Una altra manera d'aconseguir ponts Ã©s enviar un correu electrÃ²nic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreÃ§a d'un dels segÃ¼ents proveÃ¯dors de correu:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "No em funcionen els ponts! Ajuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, envieu un correu a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Incloeu el mÃ xim d'informaciÃ³ sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versiÃ³ de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Les vostres lÃnies de ponts:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Descarregueu ponts!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Seleccioneu les opcions pel tipus de pont:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Necessiteu adreces IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necessiteu un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "El navegador no estÃ  mostrant les imatges correctament."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "IntroduÃ¯u els carÃ cters de la imatge superior..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Com comenÃ§ar a utilitzar els ponts"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,21 @@ msgid ""
 msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pÃ gina de descÃ rrega\n%s i desprÃ©s seguir les instruccions per descarregar i iniciar\nel Tor Browser. "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Quan aparegui el diÃ leg 'ConfiguraciÃ³ Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "El vostre ProveÃ¯dor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -361,28 +365,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Seleccioneu 'SÃ' i desprÃ©s cliqueu 'SegÃ¼ent'. Per configurar els ponts nous, copieu i\nenganxeu les lÃnies del pont al segÃ¼ent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botÃ³ \nd''Ajuda' a l'auxiliar de 'ConfiguraciÃ³ Xarxa Tor' per mÃ©s assistÃ¨ncia."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Mostra aquest missatge."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Demanar ponts estÃ ndard."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Demanar ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Demanar un Pluggable Transport per TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Descarregar una cÃ²pia de la clau pÃºblica GnuPG del BridgeDB."
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 544a6da70..9c661eb4a 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A5h8d0wf0x <littleslyfoxie28@xxxxxxxxx>, 2014
 # Adam Slovacek <adamslovacek@xxxxxxxxx>, 2013
 # Elisa <valhalla@xxxxxxxxxxxxx>, 2011
@@ -19,17 +18,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-10-25 18:02+0000\n"
-"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "PromiÅ?te. VÃ¡Å¡ poÅ¾adavek se nepodaÅ?ilo provÃ©st."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "NahlÃ¡sit chybu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Seznam zmÄ?n"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "OznaÄ?it vÅ¡e"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Zobrazit QR kÃ³d"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kÃ³d pro vaÅ¡e linky k mostÅ¯m"
 
@@ -77,58 +91,58 @@ msgstr "QR kÃ³d pro vaÅ¡e linky k mostÅ¯m"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "JeÅ¾ÃÅ¡ku na kÅ?ÃÅ¾ku!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "PÅ?i zpracovÃ¡nÃ vaÅ¡eho QR kÃ³du zÅ?ejmÄ? nastala chyba."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Tento QR kÃ³d obsahuje linky pro vÃ¡Å¡ most. Pro zkopÃrovÃ¡nÃ na mobilnÃ nebo jinÃ¡ zaÅ?ÃzenÃ naskenujte QR kÃ³d Ä?teÄ?kou."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "NynÃ nejsou k dispozici Å¾Ã¡dnÃ© mosty..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾nÃ¡ by jste mÄ?l zkusit %s jÃt zpÄ?t %s a vybrat jinÃ½ typ mostÅ¯!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "StÃ¡hnout %sprohlÃÅ¾eÄ? Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskat %s mosty %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
@@ -137,27 +151,27 @@ msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sen mi dejte mosty!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "RozÅ¡ÃÅ?enÃ¡ nastavenÃ"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Å¾Ã¡dnÃ©"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sA%sno!"
@@ -165,7 +179,7 @@ msgstr "%sA%sno!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastavit mosty"
@@ -209,7 +223,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Ahoj, pÅ?Ãteli!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VeÅ?ejnÃ© klÃÄ?e"
 
@@ -259,7 +273,7 @@ msgid ""
 "\n"
 msgstr "BridgeDB mÃ¡ takÃ© spoustu obyÄ?ejnÃ½ch mostÅ¯ %s bez Å¾Ã¡dnÃ½ch \nPluggable Transports %s. To sice nemusÃ znÃt tak super, ale poÅ?Ã¡d vÃ¡m mohou v mnoha pÅ?Ãpadech\npomoci obejÃt internetovou cenzuru.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Co jsou to mosty?"
 
@@ -277,8 +291,8 @@ msgstr "PotÅ?ebuji jinÃ½ zpÅ¯sob jak zÃskat most!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "DalÅ¡Ã zpÅ¯sob, jak zÃskat mosty, je poslat e-mail na %s. MÄ?jte prosÃm na pamÄ?ti, Å¾e musÃte poslat e-mail pouze ze schrÃ¡nky nÃ¡sledujÃcÃch poskytovatelÅ¯ e-mailovÃ½ch sluÅ¾eb:\n%s, %s nebo %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "MÃ© mosty nefungujÃ. PotÅ?ebuji pomoc!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud vÃ¡m Tor nefunguje, poÅ¡lete nÃ¡m e-mail na %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "NapiÅ¡te nÃ¡m co nejvÃce o vaÅ¡em problÃ©mu, vÄ?etnÄ? seznamu\nmostÅ¯ a pluggable Transports, kterÃ© jste se pokusili pouÅ¾Ãt, vaÅ¡i verzi prohlÃÅ¾eÄ?e Tor,\nvÅ¡echny zprÃ¡vy, kterÃ© jste od Toru zÃskali, atd."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Zde jsou vaÅ¡e linky k mostÅ¯m: "
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ZÃskat mosty!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Vyberte ÃºrosÃm nastavenÃ pro typ mostu:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "PotÅ?ebujete IPv6 adresu?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "PotÅ?ebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prohlÃÅ¾eÄ? nezobrazuje sprÃ¡vnÄ? obrÃ¡zky."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Zadejte pÃsmena z obrÃ¡zku vÃ½Å¡e..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Jak zaÄ?Ãt pouÅ¾Ãvat mosty."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
 msgstr "K vloÅ¾enÃ mostÅ¯ do prohlÃÅ¾eÄ?e Tor, postupujte podle instrukcÃ ke staÅ¾enÃ a spuÅ¡tÄ?nÃ na %s strÃ¡nce\nke staÅ¾enÃ prohlÃÅ¾eÄ?e Tor %s."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "KdyÅ¾ vyskoÄ?Ã 'NastavenÃ sÃtÄ? Tor', klepnÄ?te na 'Konfigurovat' a postupujte\npodle prÅ¯vodce, dokud se nezeptÃ¡:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ?ipojenÃ (ISP) spojenÃ se sÃtÃ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -365,28 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Vyberte 'Ano' a potÃ© kliknÄ?te 'DalÅ¡Ã'. Pro nastavenÃ novÃ½ch mostÅ¯ zkopÃrujte a\nvloÅ¾te linky k mostÅ¯m do textovÃ©ho pole. Nakonec kliknÄ?te na 'PÅ?ipojit' a\nto by uÅ¾ mÄ?lo bÃ½t vÅ¡echno. Pokud narazÃte na problÃ©my, zkuste kliknout na tlaÄ?Ãtko 'Pomoc'\nv dialogu prÅ¯vodce 'NastavenÃ sÃtÄ? Tor'."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "ZobrazÃ tuto zprÃ¡vu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "PoÅ¾Ã¡dat o obyÄ?ejnÃ© mosty."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "PoÅ¾Ã¡dat o IPv6 mosty."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "PoÅ¾Ã¡dat o Pluggable Transport s TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "ZÃskat kopii veÅ?ejnÃ©ho GnuPG klÃÄ?e BridgeDB."
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 403498ecc..249a3d0e7 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Christian Villum <villum@xxxxxxxxxxx>, 2014-2015
 # David Nielsen <gnomeuser@xxxxxxxxx>, 2014
 # Mogelbjerg <jan@xxxxxxxxxxxxx>, 2015
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-21 06:01+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Beklager. Noget gik galt med din anmodning."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "RapportÃ©r en fejl"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ã?ndringslog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Marker alle"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Vis QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode for dine brolinjer"
 
@@ -74,58 +88,58 @@ msgstr "QRCode for dine brolinjer"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ups, vi stÃ¥r i lort til halsen!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-lÃ¦ser for at kopiere dine brolinjer over til mobile og andre enheder."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Du kunne mÃ¥se prÃ¸ve %s at gÃ¥ tilbage %s og vÃ¦lge en anden brotype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Trin %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Trin %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "FÃ¥ %s broer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Trin %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s TilfÃ¸j broer til Tor Browser %s"
@@ -134,27 +148,27 @@ msgstr "%s TilfÃ¸j broer til Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare giv mig broer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Avancerede indstillinger"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -162,7 +176,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sent broer"
@@ -206,7 +220,7 @@ msgstr "Hej %s!"
 msgid "Hello, friend!"
 msgstr "Hej min ven!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸gler"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket mÃ¥ske ikke lyder sÃ¥ smart, men de kan\nstadigvÃ¦k hjÃ¦lpe med at omgÃ¥ internet censur i mange tilfÃ¦lde.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Hvad er broer?"
 
@@ -274,8 +288,8 @@ msgstr "Jeg har brug for en alternativ metode til at fÃ¥ broer pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "En anden mÃ¥de at finde broer er at sende en e-mail til %s. BemÃ¦rk venligst at du skal\nsende mailen fra en konto hos en af de fÃ¸lgende e-mailudbydere:\n%s, %s eller %s."
+"%s or %s."
+msgstr "En anden mÃ¥de at finde broer er at sende en email til %s. BemÃ¦rk venligst at du skal\nsende emailen fra en konto hos en af de fÃ¸lgende email udbydere:\n%s eller %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Mine broer virker ikke! Jeg har brug for hjÃ¦lp!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis Tor ikke virker for dig kan du sende en e-mail til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v at inkluderer sÃ¥ meget information om din sag som muligt, der i blandt:\nEn liste af broer og udskiftelige transporter du har prÃ¸vet at bruge, din\nTor Browser-version, hvilke beskeder Tor gav, osv."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro linjer:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Find broer!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "VÃ¦lg venligst valgmuligheder for brotypen:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Har du brug for IPv6 adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Har du brug for en %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Din browser kan ikke vise billeder ordentligt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Indtast tegnene fra billedet ovenfor..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "SÃ¥dan starter du med at bruge dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "For at tage broer ind i Tor Browser, gÃ¥ da fÃ¸rst til %s Tor Browser\ndownloadside %s og fÃ¸lg instruktionerne i hvordan Tor Browser \ndownloades og startes."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r \"Tor-netvÃ¦rksindstillinger\"-dialogen popper op, sÃ¥ klik pÃ¥ \"Konfigurer\" og fÃ¸lg guiden til den siger:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokerer eller pÃ¥ anden vis censurerer din internetudbyder forbindelser\ntil Tor-netvÃ¦rket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "VÃ¦lg \"Ja\" og klik sÃ¥ pÃ¥ \"NÃ¦ste\". For at konfigurere dine nye broer, kopiÃ©r\nog indsÃ¦t brolinjerne i den nÃ¦ste input boks. Klik til sidst 'Forbind', og sÃ¥\ner du klar! Hvis du stÃ¸der pÃ¥ problemer, sÃ¥ prÃ¸v at klikke pÃ¥\n\"HjÃ¦lp\"-knappen i \"Tor-netvÃ¦rksindstillinger\"-guiden for at fÃ¥ yderligere hjÃ¦lp."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Vis denne besked."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Anmod almindelige broer."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Anmod IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Anmod om udskiftelig transport efter TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nÃ¸gle."
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index a5d5a41da..fa04d355f 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Christian Kaindl <crisscross.kaindl@xxxxxxxxxx>, 2015
 # trantor <clucko3@xxxxxxxxx>, 2014
 # Ettore Atalan <atalanttore@xxxxxxxxxxxxxx>, 2014
@@ -24,17 +23,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-06-11 23:31+0000\n"
-"Last-Translator: Roland Illig <roland.illig@xxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -46,35 +64,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Einen Fehler melden"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Quellcode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ã?nderungsprotokoll"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Alles auswÃ¤hlen"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode anzeigen"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode fÃ¼r Ihre BrÃ¼ckenverbindungen"
 
@@ -82,58 +96,58 @@ msgstr "QRCode fÃ¼r Ihre BrÃ¼ckenverbindungen"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Oh, es ist etwas schief gegangen!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Dieser QR-Code beinhaltet Ihre BrÃ¼ckenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre BrÃ¼ckenverbindungen auf ihre mobile und andere GerÃ¤te zu kopieren."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Im Moment sind keine BrÃ¼cken verfÃ¼gbar â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MÃ¶glicherweise sollten Sie versuchen %s zurÃ¼ckzugehen %s und einen anderen BrÃ¼ckentyp auszuwÃ¤hlen!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Schritt %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s herunterladen"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Schritt %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s BrÃ¼cken %s erhalten"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Schritt %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
@@ -142,27 +156,27 @@ msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sir nur BrÃ¼cken geben!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Erweiterte Optionen"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nein"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "keine"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -170,7 +184,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%srÃ¼cken erhalten"
@@ -214,7 +228,7 @@ msgstr "Hallo, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo Freund!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ã?ffentliche SchlÃ¼ssel"
 
@@ -264,7 +278,7 @@ msgid ""
 "\n"
 msgstr "ZusÃ¤tzlich hat die BridgeDB viele herkÃ¶mmliche BrÃ¼cken-Server %s ohnePluggable Transports %s. Das klingt erst einmal nicht so besonders. Es hilft Ihnen dennoch, in vielen FÃ¤llen die Internetzensur zu umgehen.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Was sind BrÃ¼cken?"
 
@@ -282,8 +296,8 @@ msgstr "Ich brauche einen anderen Weg, um Adressen von BrÃ¼cken-Servern zu erhal
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sie kÃ¶nnen auch eine E-Mail an %s schicken, um Adressen von BrÃ¼cken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s."
+"%s or %s."
+msgstr "Eine weitere MÃ¶glichkeit, um BrÃ¼cken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s oder %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -292,54 +306,44 @@ msgstr "Meine BrÃ¼cken-Server funktionieren nicht! Ich brauche Hilfe!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Versuchen Sie in Ihrer E-Mail mÃ¶glichst viele Informationen Ã¼ber Ihr Problem einzubeziehen, \neinschlieÃ?lich einer Liste der BrÃ¼cken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hier sind Ihre BrÃ¼ckenadressen:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Erhalten Sie Adressen von BrÃ¼cken-Servern!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Bitte wÃ¤hlen Sie die Optionen fÃ¼r den BrÃ¼ckentyp aus:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "BenÃ¶tigen Sie IPv6-Adressen?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BenÃ¶tigen Sie eine %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "So starten Sie die Benutzung Ihrer BrÃ¼cken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -348,21 +352,21 @@ msgid ""
 msgstr "Um BrÃ¼cken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Wenn der Dialog mit den Â»Tor-NetzwerkeinstellungenÂ« erscheint, \nklicken Sie auf Â»KonfigurierenÂ« und folgen den Anweisungen des Assistenten: "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -370,28 +374,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "WÃ¤hlen Sie Â»JaÂ« und klicken dann auf Â»WeiterÂ«. Um Ihre neuen BrÃ¼cken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der BrÃ¼cken und fÃ¼gen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \nÂ»VerbindenÂ« und Sie kÃ¶nnen loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den Â»HilfeÂ«-Knopf im Assistenten der Â»Tor- NetzwerkeinstellungenÂ« zu klicken, \num weitere Hilfe zu erhalten."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Diese Nachricht anzeigen."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Standard-BrÃ¼cken anfordern."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6-BrÃ¼cken anfordern."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Einen Pluggable Transport des TYPEs anfordern."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Eine Kopie des Ã¶ffentlichen GnuPG-SchlÃ¼ssels der BrÃ¼ckendatenbank erhalten."
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index d86fda92a..9f061af68 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Adrian Pappas <pappasadrian@xxxxxxxxx>, 2014
 # Aikaterini Katmada, 2015
 # andromeas <andromeas@xxxxxxxxxxx>, 2014
@@ -23,17 +22,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -45,35 +63,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Î£Ï?Î³Î½Ï?Î¼Î·! Î?Î¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬ Î¼Îµ Ï?Î¿ Î±Î¯Ï?Î·Î¼Î¬ Ï?Î±Ï?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Î?Ï?Î±Ï?Î®"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Î?Ï?Î¹Î»Î¿Î³Î® Ï?Î»Ï?Î½"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Î?Î¼Ï?Î¬Î½Î¹Ï?Î·  QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?"
 
@@ -81,58 +95,58 @@ msgstr "QRCode Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Î?Ï?Ï?Ï?, ÎºÎ¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Î?Ï?Ï? Ï?,Ï?Î¹ Ï?Î±Î¯Î½ÎµÏ?Î±Î¹, Ï?Ï?Î®Ï?Î¾Îµ ÎÎ½Î± Ï?Ï?Ï?Î²Î»Î·Î¼Î± ÎºÎ±Ï?Î¬ Ï?Î·Î½ Î±Î½Î¬ÎºÏ?Î·Ï?Î· Ï?Î¿Ï? QRCode Ï?Î±Ï?. "
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Î?Ï?Ï?Ï? Ï?Î¿ QRCode Ï?ÎµÏ?Î¹ÎÏ?ÎµÎ¹ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï?. Î?Î¹Î±Î²Î¬Ï?Ï?Îµ Ï?Î¿ Î¼Îµ ÎÎ½Î± QRCode scanner Î³Î¹Î± Î½Î± Î±Î½Ï?Î¹Î³Ï?Î¬Ï?ÎµÏ?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï? Ï?Îµ ÎºÎ¹Î½Î®Ï?Î· ÎºÎ±Î¹ Î¬Î»Î»Î· Ï?Ï?Ï?ÎºÎµÏ?Î®."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î´Î¹Î±Î¸ÎÏ?Î¹Î¼ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Î?Î¿ÎºÎ¹Î¼Î¬Ï?Ï?Îµ Î½Î± %s Ï?Î¬Ï?Îµ Ï?Î¯Ï?Ï? %s ÎºÎ±Î¹ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Î´Î¹Î±Ï?Î¿Ï?ÎµÏ?Î¹ÎºÏ? Ï?Ï?Ï?Î¿ Î³ÎÏ?Ï?Ï?Î±Ï?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Î?Î®Î¼Î± %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Î?Î®Î¼Î± %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Î?Ï?Î¿ÎºÏ?Î®Ï?Ï?Îµ Ï?Î¹Ï? %s Î³ÎÏ?Ï?Ï?ÎµÏ?%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Î?Î®Î¼Î± %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browser %s"
@@ -141,27 +155,27 @@ msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browse
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÎ?%sÏ?Î»Ï?Ï? Î´Ï?Ï?Îµ Î¼Î¿Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Î?Ï?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Î?Ï?Î¹"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ÎºÎ±Î½ÎÎ½Î±"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÎ?%sÎ±Î¹!"
@@ -169,7 +183,7 @@ msgstr "%sÎ?%sÎ±Î¹!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÎ?%sÎ®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½"
@@ -213,7 +227,7 @@ msgstr "Î?ÎµÎ¹Î¬ Ï?Î±Ï?, %s!"
 msgid "Hello, friend!"
 msgstr "Î?ÎµÎ¹Î± Ï?Î¿Ï?, Ï?Î¯Î»Îµ!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Î?Î·Î¼Ï?Ï?Î¹Î± Î?Î»ÎµÎ¹Î´Î¹Î¬"
 
@@ -263,7 +277,7 @@ msgid ""
 "\n"
 msgstr "Î?Ï?Î¯Ï?Î·Ï?, Î· BridgeDB ÎÏ?ÎµÎ¹ Ï?Î¿Î»Î»ÎÏ? Ï?Î±Î»Î¹ÎÏ? ÎºÎ±Î»ÎÏ? Î³ÎÏ?Ï?Ï?ÎµÏ? %s Ï?Ï?Ï?Î¯Ï?\nPluggable Transports %s Ï?Î¿Ï? Î¯Ï?Ï?Ï? Î´ÎµÎ½ Î±ÎºÎ¿Ï?Î³ÎµÏ?Î±Î¹ ÎºÎ±Ï?Î±Ï?Î»Î·ÎºÏ?Î¹ÎºÏ?, Î±Î»Î»Î¬ Ï?Îµ Ï?Î¿Î»Î»ÎÏ? Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÎ¹Ï? Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï? Î²Î¿Î·Î¸Î®Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï?Î±ÎºÎ¬Î¼Ï?ÎµÏ?Îµ Ï?Î· Î»Î¿Î³Î¿ÎºÏ?Î¹Ï?Î¯Î±.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Î¤Î¹ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ?;"
 
@@ -281,8 +295,8 @@ msgstr "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ ÎÎ½Î±Î½ ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÏ? Ï?Ï?Ï?Ï?Î¿ Î³Î¹Î± 
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬ Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î»Î¬Î²ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?ÎµÎ»Î½Î¿Î½Ï?Î±Ï? email Ï?Ï?Î¿ %s. Î Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?ÎµÎ¯Î»ÎµÏ?Îµ email Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? Î¼Î¯Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· email Î±Ï?Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î¬Ï?Î¿Ï?Î¿Ï?Ï?:\n%s, %s or %s."
+"%s or %s."
+msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬, Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ?, Ï?Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ %s. Î£Î·Î¼ÎµÎ¯Ï?Ï?Î·: Î¤Î¿ email Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?Î±Î»ÎµÎ¯ Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î±Ï?Ï?Ï?Î¿Ï?Ï?:\n%s Î® %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -291,54 +305,44 @@ msgstr "Î?Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Î¿Ï? Î´ÎµÎ½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¿Ï?Î½! Î§Ï?ÎµÎ¹Î¬Î¶Î¿
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Î?Î½ Ï?Î¿ Tor Ï?Î±Ï? Î´Îµ Î´Î¿Ï?Î»ÎµÏ?ÎµÎ¹, Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? Î´Ï?Ï?Ï?Îµ Î¼Î±Ï? Ï?Ï?Î¿ Ï?Î¿ Î´Ï?Î½Î±Ï?Ï?Î½ Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Ï?Î»Î·Ï?Î¿Ï?Î¿Ï?Î¯ÎµÏ? Î³Î¹Î± Ï?Î¿ \nÏ?Ï?Î¬Î»Î¼Î± Ï?Î¿Ï? Ï?Ï?Î½Î±Î½Ï?Î®Ï?Î±Ï?Îµ, Ï?Ï?Ï?Ï? Ï?Î· Î»Î¯Ï?Ï?Î± Î³ÎµÏ?Ï?Ï?Ï?Î½ ÎºÎ±Î¹ Ï?Î± Pluggable Transports \nÏ?Î¿Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?Î±Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ, Ï?Î·Î½ ÎÎºÎ´Î¿Ï?Î· Ï?Î¿Ï? Tor Browser, \nÏ?,Ï?Î¹ Î¼Î·Î½Ï?Î¼Î±Ï?Î± ÎÎ´ÎµÎ¹Î¾Îµ Ï?Î¿ Tor, ÎºÏ?Î»."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³Ï?Î±Î¼Î¼ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Î?Î®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¹Ï? ÎµÏ?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Î¿Î½ Ï?Ï?Ï?Î¿ Ï?Î·Ï? Î³ÎÏ?Ï?Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Î§Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ Î¼Î¹Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· IPv6;"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Î?Î®Ï?Ï?Ï? Ï?Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ ÎÎ½Î± %s;"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Î? browser Ï?Î±Ï? Î´ÎµÎ½ ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Ï?Î¹Ï? ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Ï?Î¬."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÏ?Î®Ï?ÎµÏ? Î±Ï?Ï? Ï?Î·Î½ Ï?Î±Ï?Î±Ï?Î¬Î½Ï? Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î¯Î±..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Î Ï?Ï? Î½Î± Î±Ï?Ï?Î¯Ï?ÎµÏ?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Î±Ï?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +351,21 @@ msgid ""
 msgstr "Î?Î¹Î± Î½Î± ÎµÎ¹Ï?Î¬Î³ÎµÏ?Îµ bridges Ï?Ï?Î¿ Tor Browser, Î±Ï?Ï?Î¹ÎºÎ¬ ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ %s Tor Browser Ï?ÎµÎ»Î¯Î´Î±\nÎºÎ±Ï?ÎµÎ²Î¬Ï?Î¼Î±Ï?Î¿Ï?%s ÎÏ?ÎµÎ¹Ï?Î± Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¹Ï? Î¿Î´Î·Î³Î¯ÎµÏ? Î³Î¹Î± ÎºÎ±Ï?ÎÎ²Î±Ï?Î¼Î± ÎºÎ±Î¹ ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Î?Ï?Î±Î½ Ï?Ï?Î¬Ï?ÎµÏ?Îµ Ï?Ï?Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿ \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\" , ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ \"Î¡Ï?Î¸Î¼Î¹Ï?Î·\" ÎºÎ±Î¹ Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¿Ï?Ï? Î´Î¹Î±Î»Ï?Î³Î¿Ï?Ï? Î¼ÎÏ?Ï?Î¹ Î½Î± Ï?Î±Ï? Ï?Ï?Ï?Î®Ï?ÎµÎ¹:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Î? Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?\nÏ?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -369,28 +373,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ \"Î?Î±Î¹\" ÎºÎ±Î¹ Î¼ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î?Ï?Ï?Î¼ÎµÎ½Î¿\". Î?Î¹Î± Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î± Î½ÎÎ± Ï?Î±Ï? \nbridges, Î±Î½Ï?Î¹Î³Ï?Î¬Ï?Ï?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î¼Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Ï?Î½ bridges Ï?Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ \nÎºÎµÎ¹Î¼ÎÎ½Î¿Ï?. Î?ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î£Ï?Î½Î´ÎµÏ?Î·\" ÎºÎ±Î¹ Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ¯Ï?Ï?Îµ ÎµÎ½Ï?Î¬Î¾ÎµÎ¹! Î?Î½ \nÎ±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Ï?ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î±, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ \"Î?Î¿Î®Î¸ÎµÎ¹Î±\" Ï?Ï?Î¹Ï? \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? \nÎ´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\"."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Î?Î¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Î±Ï?Ï?Ï? Ï?Î¿ Î¼Î®Î½Ï?Î¼Î±."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Î?Î¯Ï?Î·Ï?Î· Ï?Î±Î»Î¹Ï?Î½ ÎºÎ±Î»Ï?Î½ bridges."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Î?Î¯Ï?Î·Ï?Î· IPv6 Î³ÎµÏ?Ï?Ï?Ï?Î½."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Î?Î·Ï?Î®Ï?Ï?Îµ ÎÎ½Î± Pluggable Transport Î²Î¬Ï?ÎµÎ¹ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Î?Î¬Î²ÎµÏ?Îµ ÎÎ½Î± Î±Î½Ï?Î¯Î³Ï?Î±Ï?Î¿ Ï?Î¿Ï? Î´Î·Î¼Î¿Ï?Î¯Î¿Ï? GnuPG ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï? Ï?Î¿Ï? BridgeDB."
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 99ad27094..50395fe70 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015
 # Richard Shaylor <rshaylor@xxxxxx>, 2014
 # ronnietse <tseronnie@xxxxxxxxx>, 2014
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 23:30+0000\n"
-"Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Source Code"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Select All"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Show QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode for your bridge lines"
 
@@ -69,58 +83,58 @@ msgstr "QRCode for your bridge lines"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "It seems there was an error getting your QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "There are no bridges available currently..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Step %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Step %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Get %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Step %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Now %s add the bridges to Tor Browser %s"
@@ -129,27 +143,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -157,7 +171,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
@@ -201,7 +215,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
@@ -269,8 +283,8 @@ msgstr "I need an alternative way of getting bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "My bridges don't work! I need help!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Displays this message."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Request a Pluggable Transport by TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index e995146b8..89b8816d4 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # identity, 2012
 # Mara Monstro <errydayanarchy@xxxxxxxxxx>, 2018
 # Rico Chan <rico@xxxxxxxxxxx>, 2014
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-07-11 23:22+0000\n"
-"Last-Translator: 6c9ad24fb5ff3a00859fb84514d79173\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Pardonu! Io ne funkcias pri via peto."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "raporti cimo"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "fontkodo"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Å?anÄ?oprotokolo"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "kontakto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "elekti Ä?ion"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Montri QR-kodon"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Kodo por viaj ponto linioj"
 
@@ -71,58 +85,58 @@ msgstr "QR Kodo por viaj ponto linioj"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "ho ve, ho ve!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Å?ajnas, ke estis eraro ricevante vian QR-kodon."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ä?i tiu QR-kodo enhavas viajn ponto liniojn. Skanu Ä?in per QR-leganto por kopii viajn ponto liniojn sur poÅ?telefonojn kaj aliajn aparatojn."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Nuntempe ne ekzistas retpontojn."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Vi eble davas provi %s reiri %s kaj selekti alian retpontospeco."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "paÅ?o %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "elÅ?uti %s Tor-retumilo %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "paÅ?o %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ekhavi %s retpotojn %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "paÅ?o %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
@@ -131,27 +145,27 @@ msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%suj donu retpontojn al mi!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "detalaj opcioj"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "neniom/neniu"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%ses!"
@@ -159,7 +173,7 @@ msgstr "%sJ%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sE%skhavi Bridges"
@@ -203,7 +217,7 @@ msgstr "Saluton, %s!"
 msgid "Hello, friend!"
 msgstr "Saluton, amiko!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "publikaj Å?losiloj"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "Krome BridgeDB havas abundon da regulaj retpontoj %s sen iuj\nPluggable Transports %s, kiuj eble ne estas mojosa, tamen ofte povas helpi eviti\nreta cenzuro.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Kio estas retpontoj?"
 
@@ -271,8 +285,8 @@ msgstr "Mi bezonas alternativon ekhavi retpontojn!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sendu retletero al %s por ekhavi retpontojn alternative. Bonvolu konstati ke vi\nbezonas sendi retleteron per adreso de la sekvonta retpoÅ?ta provizanto:\n%s, %s aÅ %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor ne funkcias, kontaktigu %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Provu klarigi vian kazon tre detale kaj aldonu liston da retpontoj kaj Pluggable Transports\nkiujn vi provis uzi. Krome aldonu vian Tor Browser-version kaj Ä?iujn mesaÄ?ojn, kiujn Tor\neligis."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Jen viaj retpontoj:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ekhavu retpontojn!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Bonvolu selekti opciojn pri retpontospeco."
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ä?u vi bezonas IPv6-adresojn?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ä?u vi bezonas %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Via retumilo vidigas bildojn ne dece."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Enigu la literoj en la bildo Ä?i-supre."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kiel komenci uzi viajn retpontojn."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "Por enigi retpontojn en Tor Browser, unue iru al la %s elÅ?uta paÄ?o de Tor Browser %s kaj poste sekvu la instruojn tie por elÅ?uti kaj startigi Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kiam la Tor retagordaj dialogujo elklapas, alklaku 'agordi/konfiguri' kaj sekvu\nla asistanto Ä?is Ä?i demandas: "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ä?u via provizanto de retservoj (angle: ISP) blokas aÅ alimaniere cenzuras konektojn al la Tor-reto?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selektu 'Jes' kaj alklaku 'sekva'. Por konfiguri viajn novajn retpontojn, kopiu kaj alglui\nla retpontolineojn al la dialogujo. Finfine alklaku 'konektiÄ?i'.\nSe vi havas problemojn, provi alklaki la 'helpo'-butonon en la Tor-retagordasistanto\npor pli da asistado."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Vidigi Ä?i tiun mesaÄ?on."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Peti IPv6-retpontojn."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Peti permutebla transporto de TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ekhavi kopio de publika GnuPG-Å?losilo de BridgeDB."
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 754becfdc..b72cee53d 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # dark_yoshi <angelargi@xxxxxxxx>, 2014
 # toypurina <biolenta@xxxxxxxxxx>, 2014
 # B. K., 2016
@@ -25,17 +24,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-03-10 11:12+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -47,35 +65,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Informar sobre un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Registro de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todos"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar cÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para tus lÃneas de puentes"
 
@@ -83,58 +97,58 @@ msgstr "CÃ³digo QR para tus lÃneas de puentes"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Oh oh, Â¡la liamos!  "
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que hubo un error al obtener tu cÃ³digo QR. "
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©alo con un lector de cÃ³digos QR para copiar tus lÃneas de puente a dispositivos mÃ³viles y otros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ahora mismo no hay ningÃºn puente disponible..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Â¡Tal vez deberÃas probar a %s retroceder %s y seleccionar un tipo distinto de puente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s "
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descarga %s el Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Consigue %s puentes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
@@ -143,27 +157,27 @@ msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡Dame %sS%sÃ³lo puentes! "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -171,7 +185,7 @@ msgstr "Â¡%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sC%sonseguir Puentes"
@@ -215,7 +229,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -265,7 +279,7 @@ msgid ""
 "\n"
 msgstr "AdemÃ¡s, BridgeDB tiene un montÃ³n de puentes estÃ¡ndar %s sin ningÃºn Pluggable Transport %s , lo que tal vez no suena tan molÃ³n, pero que todavÃa pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Â¿QuÃ© son los puentes?"
 
@@ -283,8 +297,8 @@ msgstr "Â¡Necesito un modo alternativo de obtenciÃ³n de puentes de red!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico:\n%s, %s o %s."
+"%s or %s."
+msgstr "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrÃ³nico usando una direcciÃ³n de uno de los siguientes proveedores\nde correo electrÃ³nico:\n%s o %s"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -293,54 +307,44 @@ msgstr "Â¡Mis puentes funcionan! Â¡Necesito ayuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, debes enviar un correo a %s"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta incluir tanta informaciÃ³n como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versiÃ³n de Tor Browser y cualquier mensaje que Tor haya dado, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Estas son tus lÃneas de puente de red:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Â¡Obtener puentes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecciona opciones para el tipo de puente:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no estÃ¡ mostrando las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Introduce los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar los puentes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +353,21 @@ msgid ""
 msgstr "Para introducir puentes de red en el Tor Browser, ve a la %s pÃ¡gina de descarga del Tor Browser %s y sigue las instrucciones de descarga e inicio del Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Cuando aparezca el cuadro 'ConfiguraciÃ³n de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Â¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -371,28 +375,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecciona 'SÃ' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las lÃneas de puentes en el recuadro de texto.\nPor Ãºltimo, haz clic en 'Conectar', Â¡y listo! Si hay algÃºn problema, prueba en 'Ayuda' en el asistente de 'ConfiguraciÃ³n de red Tor' para asistencia adicional."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Muestra este mensaje."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Solicitar puentes estÃ¡ndar."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Solicitar puente de red IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Solicitar un Pluggable Transport por TYPE ."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index d5bd8da48..075672da5 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # cametiope <aldohcasa@xxxxxxxxxxx>, 2014
 # Alfredo Chaves <achaves.blg@xxxxxxxxx>, 2015
 # angelica14 <angmarmt13@xxxxxxxxx>, 2014
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-07 15:16+0000\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@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.7.0\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con tu solicitud."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "BitÃ¡cora de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para tus lÃneas de bridge"
 
@@ -74,58 +88,58 @@ msgstr "CÃ³digo QR para tus lÃneas de bridge"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Â¡Oh, sonamos!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ha ocurrido un error al obtener tu cÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene tus lÃneas de bridge. Escanealo con un lector de cÃ³digos QR para copiarlas en tus dispositivos mÃ³viles y otros."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "En este momento no existen bridges disponibles..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Â¡Tal vez deberÃas %s volver %s y escoger otro tipo de bridge!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar el %s Navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregÃ¡ los puentes al Navegador Tor %s"
@@ -134,27 +148,27 @@ msgstr "Ahora %s agregÃ¡ los puentes al Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡%sS%solamente dÃ¡me bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -162,7 +176,7 @@ msgstr "Â¡%sS%sÃ!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtener bridges"
@@ -206,7 +220,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de cuete, %s sin ningÃºn\nPluggable Transports %s, que tal vez no suenen tan genial, pero aÃºn pueden\nayudar a burlar la censura de internet en muchos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Â¿QuÃ© son los bridges?"
 
@@ -274,8 +288,8 @@ msgstr "Â¡Necesito una manera alternativa de obtener bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otra manera de obtener bridges es enviando un correo electrÃ³nico a %s.  Por favor notÃ¡ que debÃ©s enviar el correo electrÃ³nico usando una direcciÃ³n de uno de los siguientes proveedores:\n%s, %s o %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Â¡Mis bridges no funcionan! Â¡Necesito ayuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, deberÃas enviar un correo electrÃ³nico a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "IntentÃ¡ incluir toda la informaciÃ³n posible sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, la versiÃ³n de tu Navegador Tor,\ny cualquier mensaje que Tor haya presentado, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "AquÃ estÃ¡n tus lÃneas de bridges:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Â¡ObtenÃ© Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccionÃ¡ opciones para tipo de bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿NecesitÃ¡s direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿NecesitÃ¡s una %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "IngresÃ¡ los caracteres de la imagen..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar tus bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "Para introducir puentes en tu Navegador Tor, primero andÃ¡ hasta la %s pÃ¡gina de descarga\ndel Navegador Tor %s y desde ahÃ seguÃ las instrucciones para descargar y ejecutar el Navegador Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Cuando el diÃ¡logo 'ConfiguraciÃ³n de Red de Tor' aparezca, cliqueÃ¡ 'Configurar' y continuÃ¡ con\nel asistente hasta que pregunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Â¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algÃºn modo censura conexiones\na la red de Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "SeleccionÃ¡ 'SÃ' y luego cliqueÃ¡ 'Siguiente'.  Para configurar tus nuevos bridges, copiÃ¡ y\npegÃ¡ las lÃneas de bridges en el cuadro de texto.  Finalmente, cliqueÃ¡ 'Conectar' y,\nÂ¡eso deberÃa de ser todo! Si experimentÃ¡s algÃºn problema, intentÃ¡ cliquear el botÃ³n 'Ayuda'\ndel asistente de 'ConfiguraciÃ³n de la Red de Tor' para recibir mÃ¡s asistencia."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Mostrar Ã©ste mensaje."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Pedir bridges ordinarios."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Pedir bridges IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Pedir un Pluggable Transport por TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index 65b188d05..b6dc414ba 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Bernard Rodriguez <hey.bernard@xxxxxxxxx>, 2016
 # manuelglz <cglzmtzg@xxxxxxxxx>, 2014
 # Javier Flores Topete <javierflorestopete789@xxxxxxxxx>, 2015
@@ -15,17 +14,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-20 00:56+0000\n"
-"Last-Translator: b39e6b72373066b02663de71fc788486\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "PerdÃ³n! Algo saliÃ³ mal con tu peticiÃ³n."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Registro de cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar cÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR  para las entradas de tu(s) repetidores/puente(s)(bridge lines)"
 
@@ -73,58 +87,58 @@ msgstr "CÃ³digo QR  para las entradas de tu(s) repetidores/puente(s)(bridge line
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Â¡Oh, diantres!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que hubo un error al obtener tu cÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este cÃ³digo QR contiene entradas de tus repetidores/puentes. LÃ©elo con un lector de cÃ³digos QR para copiar las entradas de tus repetidores/puentes en tu telÃ©fono mÃ³vil u otros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Actualmente no hay ningÃºn repetidor/puente disponible..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Tal vez deberÃa intentar %s ir hacÃa atrÃ¡s %s y seleccionar un tipo de repetidor/puente diferente."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s repetidores/puentes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
@@ -133,27 +147,27 @@ msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡SÃ³lo(%sJ%s) dame los repetidores/puentes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡SÃ(%sY%s)!"
@@ -161,7 +175,7 @@ msgstr "Â¡SÃ(%sY%s)!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "Obtener(%sG%s) repetidores/puentes"
@@ -205,7 +219,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola, amigo!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves PÃºblicas"
 
@@ -255,7 +269,7 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB tiene muchos puentes de simple vainilla %s sin tener ningun transporte conectable %s lo cual podria no sonar tan genial, pero aun asi pueden ayudar con la censura de internet en muchos casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Â¿Que son puentes?"
 
@@ -273,8 +287,8 @@ msgstr "Â¡Necessito una forma alternativo de conectar con puentes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otro modo de consigir puentes es mandar un correo electronico a %s. Tenga en cuenta que debe enviar el correco electronico con direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico: %s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "Â¡Mis puentes no funcionan! Â¡Necesito ayuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si tu Tor no funciona, usted debe enviar por correo electrÃ³nico %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta poner tanta informacion como puedas sobre tu problema, incluyendo una lista de los puentes y Pluggable Transports que hayas intentado usar, tu version de Tor Browser, y cualquier mensaje que Tor haya mostrado, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Aqui estan tus puentes:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Â¡Obten puentes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor selecciona las opciones para tu tipo de puente:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imagenes correctamente"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ponga los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Como empezar a usar tus puentes."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,21 @@ msgid ""
 msgstr "Para conectar puentes al Tor Browser; primero ve al %s Tor Browser pagina de descargas %s luego siga las instrucciones para descargar y empezar\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Cuando la \"ConfiguraciÃ³n de Red Tor\" aparesca, presione \"Configurar y siguiente\nhasta que pregunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Â¿Tu proveedor de servicios de internet (ISP) bloquea o censura las conecciones\na la red Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -361,28 +365,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Seleccione \"Si\" luego presione \"Siguiente\".\nPara configurar sus nuevos puentes, copie y pegue\nlas lineas de los puentes en la caja de texto. Finalmente, presione \"Conectar\" y Â¡deberias de estar listo para continuar! Si tienes problemas, prueba presionar en  el botÃ³n de \"Ayuda\" en las \"configuraciones de red de Tor\" para mas asistencia."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Muestra este mensaje"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Solicita un puente por defecto"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Solicita puentes IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Solicita un transporte enchufable por TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obten una copia de la llave GnuPG deBridgeDBÂ´s "
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index 3663a1f25..d1798814e 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Emma Peel, 2019
 # G <purexxxx@xxxxxxxxxxx>, 2015
 # Mart Laub <mart@xxxxxxx>, 2014
@@ -12,17 +11,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-30 10:46+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Vabandust! Midagi lÃ¤ks Teie pÃ¤ringuga valesti."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Teatage viga"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "LÃ¤htekood"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Muudatuste logi"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vali kÃµik"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "NÃ¤ita QR-koodi"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRKood teie silla ridade jaoks"
 
@@ -70,58 +84,58 @@ msgstr "QRKood teie silla ridade jaoks"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Oli seda nÃ¼Ã¼d vaja..."
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR-koodi hankimisel ilmnes viga."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et kopeerida silla read telefoni vÃµi teistesse seadmetesse."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ã?htegi silda ei ole hetkel saadaval..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "VÃµib-olla peaksid proovima %s tagasi minna %s ja valima teise silla tÃ¼Ã¼bi!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s samm."
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Lae alla %s Tor brauser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s samm."
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hangi %s sillad %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s samm."
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¼Ã¼d %s lisa sillad Tor\\'i brauserisse%s"
@@ -130,27 +144,27 @@ msgstr "NÃ¼Ã¼d %s lisa sillad Tor\\'i brauserisse%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sihtsalt anna mulle sillad!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "TÃ¤psemad seaded"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "mitte Ã¼kski"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sah!"
@@ -158,7 +172,7 @@ msgstr "%sJ%sah!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sangi sillad"
@@ -202,7 +216,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Tervist, sÃµber!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Avalikud VÃµtmed"
 
@@ -252,7 +266,7 @@ msgid ""
 "\n"
 msgstr "Lisaks on BridgeDB-l ka palju tavapÃ¤raseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis vÃµib-olla ei kÃµla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kÃµrvale pÃµigata.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Mis on sillad?"
 
@@ -270,8 +284,8 @@ msgstr "Mul on vaja teist viisi sildade saamiseks!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Sildu on vÃµimalik saada ka saates e-maili jÃ¤rgnevale aadressile: %s. Palun pange\ntÃ¤hele, et peate saatma e-maili selliselt aadressilt, mis kasutab Ã¼hte jÃ¤rgnevatest e-maili teenusepakkujatest:\n%s, %s vÃµi %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Mu sillad ei tÃ¶Ã¶ta! Vajan abi!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kui Teil Tor ei tÃ¶Ã¶ta, saatke e-mail aadressile %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Proovige lisada vÃµimalikult palju informatsioon seoses oma juhtumiga, lisades jÃ¤rjendi sildadest ja\nPluggable Transports\\'idest, mida Te Ã¼ritasite kasutada; oma Tor brauseri versioon\nja kÃµik teated, mida Tor sulle edastas jne."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Siin on teie silla read:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Hangi sillad!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Palun valige silla tÃ¼Ã¼p:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Kas teil on vaja IPv6 aadresse?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Kas teil on vaja %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Sisestage Ã¼lemisel pildil olevad sÃ¼mbolid..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kuidas alustada oma sildade kasutamist"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
 msgstr "Et lisada sildu Tor\\'i brauserisse, minge %s Tor\\'i brauseri allalaadimislehekÃ¼ljele %s ja jÃ¤rgige seal olevaid instruktsioone Tor brauseri allalaadimiseks ja kÃ¤ivitamiseks."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kui 'Tor\\'i vÃµrgu seaded' dialoog kerkib esile, vajutage 'Seadista' ja jÃ¤rgige nÃµustajat kuni see kÃ¼sib:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Kas Teie Internetiteenuse pakkuja (ISP) blokeerib vÃµi tsensoreerib Ã¼hendusi Tor\\'i vÃµrku?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -358,28 +362,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Valige \"Jah\" ja klikkige \"JÃ¤rgmine\". Et seadistada oma uusi sildu, kopeeri ja kleebi silla read teksti sisendikasti. LÃµpetuseks vajutage \"Ã?henda\", ja kÃµik peaks toimima! Kui Teil tekib probleeme, proovige klikkida \"Abi\" nuppu, mis asub \"Tor\\'i vÃµrgu seaded\" nÃµustajas edasise abi saamiseks."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "NÃ¤itab seda teadet."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Esita pÃ¤ring tavaliste sildade jaoks."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Esita pÃ¤ring IPv6 sildade jaoks."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Esita pÃ¤ring Pluggable Transpordi jaoks TYPE jÃ¤rgi."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hangi koopia BridgeDB GnuPG avalikust vÃµtmest."
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index 8f2e0d198..576af2c8c 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # baldarra, 2013
 # Aritz Jorge SÃ¡nchez <aritz.jorge@xxxxxxxxxxxxxx>, 2015
 # baldarra, 2011, 2012
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-02 09:53+0000\n"
-"Last-Translator: Osoitz <oelkoro@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Eman errore baten berri"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Iturburu-kodea"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Changelog-a"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontaktuan jarri."
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Hautatu dena"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Erakutsi QR Kodea"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kodea zubi-lerroentzarako"
 
@@ -74,58 +88,58 @@ msgstr "QR kodea zubi-lerroentzarako"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "A ze parea!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Akats bat egon da zure QR kodea lortzen."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR kode hau zure zubi-lerroak dauzka. Eskaneatu QR kode irakurle batekin kopiatzeko mugikorrean edo beste gailutan."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Momentuz ez daude zubirik..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Agian saiatu  %s atzera itzuli %s eta beste zubi mota bat aukeratzen!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1.%s urratsa"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Jaitsi %s Tor Nabigatzailea %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2.%s urratsa"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Eskuratu %s zubiak %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3.%s urratsa"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Orain %s gehitu zubiak Torera %s"
@@ -134,27 +148,27 @@ msgstr "Orain %s gehitu zubiak Torera %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust emaidazu zubiak!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Aukera Aurreratuak"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ez"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Bat ere ez."
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sB%sai!"
@@ -162,7 +176,7 @@ msgstr "%sB%sai!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -206,7 +220,7 @@ msgstr "Kaixo, %s!"
 msgid "Hello, friend!"
 msgstr "Kaixo, lagun!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Gako Publikoak"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Zer dira zubiak?"
 
@@ -274,7 +288,7 @@ msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -284,54 +298,44 @@ msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor ondo ez badabil, %s(r)i posta elektroniko bat bidali beharko zenioke."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Zubiak Lortu!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 helbideak behar dituzu?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s behar duzu?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Sartu goiko irudiko karaktereak..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Nola hasi zure zubiak erabiltzen"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Mezu hau erakusten du"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Eskatu IPv6 zubiak."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index e2b03a093..5f72b8975 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # arashaalaei <aalaeiarash@xxxxxxxxx>, 2011
 # signal89, 2014
 # Amir Moezzi <amirreza.mz@xxxxxxxxx>, 2017
@@ -21,17 +20,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-17 08:33+0000\n"
-"Last-Translator: MYZJ\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -43,35 +61,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ù?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø¯Ø± Ø±Ø§Ø¨Ø·Ù? Ø¨Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø®Ø·Ø§Û?Û? Ø±Ø® Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ØªÙ?Ø§Ø³"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ù?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ù?Ù?Ø§Û?Ø´ QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode Ø¨Ø±Ø§Û? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§"
 
@@ -79,58 +93,58 @@ msgstr "QRCode Ø¨Ø±Ø§Û? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ø§Û? Ù?Ø§Û?Ø? Ù?ØªØ§Ø³Ù?Û?Ù?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Ø¯Ø± Ø¯Ø±Û?Ø§Ù?Øª QRCode Ø¨Ø±Ø§Û? Ø´Ù?Ø§Ø? Ø®Ø·Ø§ Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø´Øª."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ø§Û?Ù? QRCode Ø´Ø§Ù?Ù? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§ Ù?Û? Ø¨Ø§Ø´Ø¯. Ø¢Ù? Ø±Ø§ Ø¨Ø§ Û?Ú© Ø¨Ø±Ù?Ø§Ù?Ù? QRCodeØ®Ù?Ø§Ù? Ø§Ø³Ú©Ù? Ú©Ù?Û?Ø¯ ØªØ§ Ø¨ØªÙ?Ø§Ù?Û?Ø¯ Ø§Û?Ù? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?Ù?Ø¨Ø§Û?Ù? Ù? Ø³Ø§Û?Ø± Ø¯Ø³ØªÚ¯Ø§Ù? Ù?Ø§Û?ØªØ§Ù? Ù?Û?Ø² Ú©Ù¾Û? Ú©Ù?Û?Ø¯."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ù?â??Ø§Ú©Ù?Ù?Ù? Ù?Û?Ú? Ù¾Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?Û?Ø³Øª..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Ø´Ø§Û?Ø¯ Ù?Û?Ø§Ø² Ø¨Ø§Ø´Ø¯ ØªØ§ %sØ¨Ù? Ù?Ø±ØÙ?Ù? Ù?Ø¨Ù? Ø¨Ø±Ú¯Ø±Ø¯Û?Ø¯%s Ù? Ú¯Ù?Ù?Ù?â??Û? Ù¾Ù? Ø¯Û?Ú¯Ø±Û? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª %s Ù¾Ù?â?? Ù?Ø§  %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ø§Ú©Ù?Ù?Ù?Ø? %s Ø§Ù?Ø²Ù?Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
@@ -139,27 +153,27 @@ msgstr "Ø§Ú©Ù?Ù?Ù?Ø? %s Ø§Ù?Ø²Ù?Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ù¾Ù? Ù?Ø§ Ø±Ø§ Ø¨Ù?Ù? Ø¨Ø¯Ù?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ú¯Ø²Û?Ù?Ù?â??Ù?Ø§Û? Ù¾Û?Ø´Ø±Ù?ØªÙ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ù?Ù?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ù?Û?Ú?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sØ¨%sÙ?Ù?!"
@@ -167,7 +181,7 @@ msgstr "%sØ¨%sÙ?Ù?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ¯%sØ±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§"
@@ -211,7 +225,7 @@ msgstr "Ø³Ù?Ø§Ù?Ø?  %s!"
 msgid "Hello, friend!"
 msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³Øª Ù?Ù?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ú©Ù?Û?Ø¯Ù?Ø§Û? Ø¹Ù?Ù?Ù?Û?"
 
@@ -261,7 +275,7 @@ msgid ""
 "\n"
 msgstr "Ù?Ù?Ú?Ù?Û?Ù? BridgeDB Ø´Ø§Ù?Ù? ØªØ¹Ø¯Ø§Ø¯ Ø²Û?Ø§Ø¯Û? Ù¾Ù? Ù?Ø§Û? Ø§Ø¨ØªØ¯Ø§Û?Û? Ù? Ù?Ø¯Û?Ù?Û? Ø§Ø³Øª Ú©Ù? %s Pluggable Transports Ù?Ø¯Ø§Ø±Ù?Ø¯ %s Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Û? Ù?ØµØ±Ù? Ø¨Ù? Ù?Ø¸Ø± Ø¨Ø±Ø³Ù?Ø¯ Ø§Ù?Ø§ Ù?Ù?Ú?Ù?Ø§Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¯Ø± Ù?Ù?Ø§Ø±Ø¯ Ù?ØªØ¹Ø¯Ø¯Û? Ø¬Ù?Øª Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Û?Ù?ØªØ±Û?Ù?Ú¯ Ø¨Ù? Ø´Ù?Ø§ Ú©Ù?Ú© Ú©Ù?Ù?Ø¯.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ù¾Ù? Ù?Ø§ Ú?Ù? Ù?Ø³ØªÙ?Ø¯Ø?"
 
@@ -279,8 +293,8 @@ msgstr "Ø¨Ù? Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª bridge Ù?Ø§ Ø§ØØªÛ?Ø§Ø¬
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Û?Ú© Ø·Ø±Û?Ù? Ø¯Û?Ú¯Ø±Û? Ú©Ù? Ù?Û?ØªÙ?Ø§Ù?Û?Ø¯ Ù¾Ù?Ù?Ø§ Ø±Ø§ Ø¨Ú¯Û?Ø±Û?Ø¯, Ø§Ø² Ø·Ø±Û?Ù? Ù?Ø²Ø³ØªØ§Ø¯Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? %s  Ù?Û?Ø¨Ø§Ø´Ø¯. Ù?Ø·Ù?Ø§ Ø¯Ù?Øª Ù?Ø± Ù?Ø§Û?Û?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯ Ø±Ø§ ØØªÙ?Ø§ Ø§Ø² Û?Ú©Û? Ø§Ø² Ù?Ø±Ø§Ù?Ù?Ú©Ù?Ù?Ø¯ Ú¯Ø§Ù? Ø§Û?Ù?Û?Ù?Û? Ø²Û?Ø± Ø¨Ù?Ø±Ø³ØªÛ?Ø°:    %s   %s  Ù? Û?Ø§  %s  ."
+"%s or %s."
+msgstr "Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³ %s Ø§Ø³Øª. ØªÙ?Ø¬Ù? Ú©Ù?Û?Ø¯ Ø§Û?Ù?Û?Ù?Û? Ú©Ù? Ø§Ø±Ø³Ø§Ù? Ù?Û? Ú©Ù?Û?Ø¯Ø? ØØªÙ?Ø§Ù? Ø§Ø² Ø·Ø±Û?Ù? Û?Ú©Û? Ø§Ø² Ø´Ø±Ú©Øª Ù?Ø§Û? Ø²Û?Ø± Ø¨Ø§Ø´Ø¯:\n%s Û?Ø§ %s"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -289,54 +303,44 @@ msgstr "Ø¨Ù? Ú©Ù?Ú© Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?! Ù¾Ù?â??Ù?Ø§Û? Ù?Ù? Ú©Ø§Ø± Ù?Ù?Û?â??Ú©
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ø§Ú¯Ø± ØªÙ?Ø± Ø´Ù?Ø§ Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯, Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ú©Ù?Û?Ø¯ %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ø³Ø¹Û? Ú©Ù?Û?Ø¯ ØªØ§ Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±Û? Ø±Ø§ Ù?Ø±Ø§Ù?Ù? Ú©Ù?Û?Ø¯. Ø§Ø² Ø¬Ù?Ù?Ù? Ù?Û?Ø³Øª Ù¾Ù? Ù?Ø§ Ù? Pluggable Transports Ù?Ø§Û?Û? Ú©Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ø¯. Ù?Ù?Ú?Ù?Û?Ù? Ø´Ù?Ø§Ø±Ù? Ù?Ø³Ø®Ù? Tor Browser Ù? Ù?Ø± Ù¾Û?ØºØ§Ù?Û? Ú©Ù? Tor Ø¨Ù? Ø´Ù?Ø§ Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ø®Ø·Ù?Ø· Ù¾Ù? Ø´Ù?Ø§ Ø¯Ø± Ø§Û?Ù?Ø¬Ø§:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ø·Ù?Ø§ Ú¯Ø²Û?Ù?Ù? Ù?Ù?Ø¹ Ù¾Ù? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? IPv6 Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯ Ø¨Ù? Û?Ú© %sØ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?Ø±Ù?Ø±Ú¯Ø± Ø´Ù?Ø§ ØªØµØ§Ù?Û?Ø± Ø±Ø§ Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ù?Ù?Ø§Û?Ø´ Ù?Ù?Û? Ø¯Ù?Ø¯."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ú©Ø§Ø±Ø§Ú©ØªØ± Ù?Ø§ Ø±Ø§ Ø§Ø² ØªØµÙ?Û?Ø± Ø¨Ø§Ù?Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -345,21 +349,21 @@ msgid ""
 msgstr "Ø¨Ø±Ø§Û? Ù?Ø±Ù?Ø¯ Ø¨Ù? Ù¾Ù? Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø? Ø¨Ø±Ø§Û? Ø§Ù?Ù?Û?Ù? Ø¨Ø§Ø± %s Ø¨Ù? Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø±Ù?Ø±Ú¯Ø± Tor \nØµÙ?ØÙ? %s Ù? Ù¾Ø³ Ø§Ø² Ø¢Ù? Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Ø¯Ø³ØªÙ?Ø±Ø§Ù?Ø¹Ù?Ù?  Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø²\nÙ?Ø±Ù?Ø±Ú¯Ø± Tor Ø¨Ø±Ù?Û?Ø¯."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ù?Ù?ØªÛ? Ú©Ù? ØµÙ?ØÙ?  'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' Ù?Ù?Ø§Û?Ø´ Ø¯Ø§Ø¯Ù? Ø´Ø¯, Ø±Ù?Û? Ú¯Ø²Û?Ù?Ù? 'Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ù? Ø¯Ù?Ø¨Ø§Ù? Ú©Ù?Û?Ø¯\nØªØ§ Ø²Ù?Ø§Ù?Û? Ú©Ù? wizard Ø§Ø² Ø´Ù?Ø§ Ø¨Ù¾Ø±Ø³Ø¯:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ø¢Û?Ø§ Ø´Ø±Ú©Øª Ø§Ø±Ø§Û?Ù? Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª (ISP) Ø´Ù?Ø§ Ø¨Ù?Ø§Ú© Ù?Û? Ú©Ù?Ø¯ Ù? Û?Ø§ Ø³Ø§Ù?Ø³Ù?Ø± Ù?Û? Ú©Ù?Ø¯ Ø§Ø±ØªØ¨Ø§Ø·Ø§Øª\nØ´Ø¨Ú©Ù? ØªÙ?Ø± Ø´Ù?Ø§ Ø±Ø§Ø?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -367,28 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Ø¨Ù?Ù?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù? Ù? Ø³Ù¾Ø³ 'Ø¨Ø¹Ø¯Û?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. Ø¨Ø±Ø§Û? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ø¬Ø¯Û?Ø¯ Ø®Ù?Ø¯, copy Ù? paste Ú©Ù?Û?Ø¯ Ø®Ø·Ù?Ø· Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?ØªÙ? Ø¬Ø¹Ø¨Ù? Ù?Ø±Ù?Ø¯Û?. Ø¯Ø± Ù?Ù?Ø§Û?Øª, Ø±Ù?Û? 'Ø§ØªØµØ§Ù?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯,\nØ±Ø§Ù? Ø¯Ø±Ø³ØªØ´ Ø§Û?Ù? Ø§Ø³Øª! Ø§Ú¯Ø± Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?Ø¯, Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ø±Ù?Û? Ú©Ù?Û?Ø¯ 'Ø±Ø§Ù?Ù?Ù?Ø§'\nØ¯Ø± 'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' wizard Ø¨Ø±Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ø§Û?Ù? Ù¾Û?Ø§Ù? Ø±Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Û?â??Ø¯Ù?Ø¯."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø¹Ø§Ø¯Û?"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ø±Ù?Ø´ Transport Ø¬Ø§Û?Ú¯Ø²Û?Ù? Ø¨Ø±Ø§Ø³Ø§Ø³ TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ø±Ù?Ù?Ù?Ø´Øª Ø§Ø² Ú©Ù?Û?Ø¯Ù? GnuPG Ø¹Ù?Ù?Ù?Û?Ù? BridgeDB"
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index 8f863f043..9ce2ea3ce 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Hessu Lumberi <pitkahessu@xxxxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2014
@@ -19,17 +18,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "PyyntÃ¶si epÃ¤onnistui jostain syystÃ¤."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ilmoita ohjelmointivirheestÃ¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "LÃ¤hdekoodi"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Muutosloki"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "NÃ¤ytÃ¤ QR-koodi"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Siltariviesi QR-koodi"
 
@@ -77,58 +91,58 @@ msgstr "Siltariviesi QR-koodi"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Jossain on pulma!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Tapahtui virhe QR-koodia noudettassa."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "TÃ¤mÃ¤ QR-koodi sisÃ¤ltÃ¤Ã¤ siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "TÃ¤llÃ¤ hetkellÃ¤ ei ole yhtÃ¤Ã¤n siltaa saatavilla..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "EhkÃ¤ sinun pitÃ¤isi yrittÃ¤Ã¤ %s palaamalla %s ja valitsemalla eri siltatyyppi!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Vaihe %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Lataa %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Vaihe %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hanki %s sillat %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Vaihe %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
@@ -137,27 +151,27 @@ msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%snna minulle vain sillat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "LisÃ¤valitsimet"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ei mitÃ¤Ã¤n"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sK%syllÃ¤!"
@@ -165,7 +179,7 @@ msgstr "%sK%syllÃ¤!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sae sillat"
@@ -209,7 +223,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hei ystÃ¤vÃ¤!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
@@ -259,7 +273,7 @@ msgid ""
 "\n"
 msgstr "LisÃ¤ksi BridgeDB:llÃ¤ on useita tavallisia siltoja %s ilman mitÃ¤Ã¤n irrotettavia\nPluggable Transports %s-siirtoja, jotka eivÃ¤t ehkÃ¤ kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertÃ¤mÃ¤Ã¤n internet-sensuuria.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "MitÃ¤ ovat sillat?"
 
@@ -277,8 +291,8 @@ msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoitteeseen %s. Huomaa,\nettÃ¤ sinun on lÃ¤hetettÃ¤vÃ¤ sÃ¤hkÃ¶postiviesti kÃ¤yttÃ¤en yhtÃ¤ seuraavien sÃ¤hkÃ¶postitarjoajien\nosoitetta:\n%s, %s tai %s."
+"%s or %s."
+msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoitteeseen %s. Huomaa,\nettÃ¤ sinun on lÃ¤hetettÃ¤vÃ¤ sÃ¤hkÃ¶postiviesti kÃ¤yttÃ¤en yhtÃ¤ seuraavien sÃ¤hkÃ¶postitarjoajien\nosoitetta:\n%s tai %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "Siltani eivÃ¤t toimi! Tarvitsen apua!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jos Tor ei toimi sinulla, sinun pitÃ¤isi sÃ¤hkÃ¶postittaa %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "YritÃ¤ sisÃ¤llyttÃ¤Ã¤ niin paljon tietoa tapauksestasi kuin voit, mukaanlukien siltojen\nluettelo ja irrotettavat Pluggable Transport-siirrot, joita yritit kÃ¤yttÃ¤Ã¤,\nTor Browser-versio, ja kaikki viestit, jotka Tor ilmoitti, jne."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "TÃ¤ssÃ¤ ovat siltarivisi:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Hae sillat!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Valitse valitsimet siltatyypille:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Tarvitsetko IPv6-osoitteita?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Tarvitsetko %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Selaimesi ei nÃ¤ytÃ¤ kuvia oikein."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "SyÃ¶tÃ¤ merkit ylÃ¤puolella olevasta kuvasta..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kuinka aloitat siltojesi kÃ¤ytÃ¶n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
 msgstr "LisÃ¤tÃ¤ksesi siltauksia Tor Browseriin mene %s Tor Browserin lataussivulle %s ja seuraa ohjeita siellÃ¤ ladataksesi ja kÃ¤ynnistÃ¤Ã¤ksesi Tor Browserin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kun â??Tor-verkkoasetuksetâ??-valintaikkuna ponnahtaa nÃ¤kyviin, napsauta â??Configureâ?? ja seuraa asetusvelhoa, kunnes se kysyy:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "EstÃ¤Ã¤kÃ¶ tai sensuroiko Internet-palvelutarjoajasi (ISP) muuten yhteyksiÃ¤\nTor-verkkoon?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -365,28 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Valitse â??KyllÃ¤â?? ja napsauta sitten â??Seuraavaâ??. Uusien siltojen konfiguroimiseksi kopioi ja\nliitÃ¤ siltarivit tekstisyÃ¶teikkunaan. Napsauta lopuksi â??YhdistÃ¤â??, ja siirtymisen pitÃ¤isi\nonnistua! Jos kohtaat pulmia, yritÃ¤ saada lisÃ¤apua napsauttamalla â??Opasteâ??-\npainiketta â??Tor-verkkoasetuksetâ??-asetusvelhossa."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "NÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n viestin."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "PyydÃ¤ tavallisia siltoja."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "PyydÃ¤ IPv6-siltoja."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "PyydÃ¤ TYPE-tyyppistÃ¤ irrotettavaa Pluggable Transport-siirtoa."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 12d091db5..841cd3c1e 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2019
 # apaddlingduck, 2014
 # Boubou <cece31840@xxxxxxxxx>, 2015
@@ -30,17 +29,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-23 19:14+0000\n"
-"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -52,35 +70,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "DÃ©solÃ©â??! Un problÃ¨me est survenu Ã  la suite de votre requÃªte."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Signaler un bogue"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Code source"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Journal des changements"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Tout sÃ©lectionner"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Afficher le code QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Code QR pour vos lignes de ponts"
 
@@ -88,58 +102,58 @@ msgstr "Code QR pour vos lignes de ponts"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Un problÃ¨me est survenuâ??!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Il semble quâ??il y ait eu une erreur de rÃ©cupÃ©ration de votre code QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ce code QR contient vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont (Bridges) sur vos appareils, mobiles ou autres."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Aucun pont nâ??est disponible actuellementâ?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Vous devriez peut-Ãªtre %s revenir en arriÃ¨re %s et choisir un diffÃ©rent type de pontâ??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ã?tape %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "TÃ©lÃ©chargez %s le NavigateurÂ Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ã?tape %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtenez des %s ponts %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ã?tape %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
@@ -148,27 +162,27 @@ msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Donnez-moi %sj%suste des pontsâ??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Options avancÃ©es"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "aucun"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sO%suiâ??!"
@@ -176,7 +190,7 @@ msgstr "%sO%suiâ??!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtenir des ponts"
@@ -220,7 +234,7 @@ msgstr "Bonjour, %sâ??!"
 msgid "Hello, friend!"
 msgstr "Bonjour, lâ??amiâ??!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "ClÃ©s publiques"
 
@@ -270,7 +284,7 @@ msgid ""
 "\n"
 msgstr "De plus, BridgeDB propose de nombreux ponts traditionnels %s sans transport enfichable %s qui peuvent quand mÃªme aider Ã  contourner la censure Internet dans bien des cas.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Que sont les pontsâ???"
 
@@ -288,8 +302,8 @@ msgstr "Il me faut une autre faÃ§on dâ??obtenir des pontsâ??!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Une autre faÃ§on dâ??obtenir des ponts est dâ??envoyer un courriel Ã  %s. Veuillez prendre note que vous devez envoyer le courriel en utilisant une adresse provenant dâ??un des fournisseurs de courriel suivantsÂ :\n%s, %s ou %s."
+"%s or %s."
+msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email Ã  %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accÃ¨s suivant: %s ou %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -298,54 +312,44 @@ msgstr "Mes ponts ne fonctionnent pas, jâ??ai besoin dâ??aideâ??!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel Ã  %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Essayez dâ??inclure autant de renseignements sur votre cas que possible, incluant la liste de ponts et de transports enfichables que vous avez essayÃ© dâ??utiliser, votre version du NavigateurÂ Tor et tout message donnÃ© par Tor, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Voici vos lignes de pontsâ??:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Obtenez des pontsâ??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Veuillez choisir des options pour le type de pontsâ??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Avez-vous besoin dâ??adresses IPv6â???"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Votre navigateur nâ??affiche pas les images correctement."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Saisir les caractÃ¨res de lâ??image ci-dessusâ?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Comment commencer Ã  utiliser vos pontsâ???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +358,21 @@ msgid ""
 msgstr "Pour saisir des ponts dans le NavigateurÂ Tor, rendez-vous dâ??abord Ã  la %s page de tÃ©lÃ©chargement du NavigateurÂ Tor %s et suivez les instructions que vous y trouverez pour tÃ©lÃ©charger et dÃ©marrer le NavigateurÂ Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Quand la fenÃªtre Â«Â ParamÃ¨tres du rÃ©seauÂ TorÂ Â» sâ??affiche, cliquez sur Â«Â ConfigurerÂ Â» et suivez lâ??assistant jusquâ??Ã  ce quâ??il demandeÂ :"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Votre fournisseur dâ??accÃ¨s Ã  Internet (FAI) bloque-t-il ou censure-t-il vos connexions au rÃ©seauÂ Torâ???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -376,28 +380,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "SÃ©lectionnez Â«Â OuiÂ Â» et cliquez ensuite sur Â«Â SuivantÂ Â». Pour configurer vos nouveaux ponts, copiez et collez les lignes de ponts dans la boÃ®te de saisie de texte. Enfin, cliquez sur Â«Â Se connecterÂ Â» et vous devriez avoir finiâ??! Si vous Ã©prouvez des problÃ¨mes, cliquez sur le bouton Â«Â AideÂ Â» dans lâ??assistant des Â«Â ParamÃ¨tres du rÃ©seauÂ TorÂ Â» pour un soutien supplÃ©mentaire."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Affiche ce message."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Demander des ponts traditionnels."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Demander des ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Demander un transport enfichable par TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtenir une copie de la clÃ© GnuPG publique de BridgeDB."
diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po
index 44a4ea45f..883d1f210 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Kevin Scannell <kscanne@xxxxxxxxx>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-10-07 19:53+0000\n"
-"Last-Translator: Kevin Scannell <kscanne@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?r leithscÃ©al! BhÃ fadhb leis an iarratas a rinne tÃº."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Tuairiscigh Fabht"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³d Foinseach"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Logchomhad athruithe"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "TeagmhÃ¡il"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Roghnaigh Uile"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "TaispeÃ¡in CÃ³d QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Do chuid lÃnte droichid mar chÃ³d QR"
 
@@ -67,58 +81,58 @@ msgstr "Do chuid lÃnte droichid mar chÃ³d QR"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "OchÃ³n Ã³!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "DealraÃonn sÃ© gur tharla earrÃ¡id agus do chÃ³d QR Ã¡ fhÃ¡il."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "TÃ¡ do chuid lÃnte droichid laistigh den chÃ³d QR seo. Is fÃ©idir Ã© a scanadh le lÃ©itheoir QR chun na lÃnte droichid a chÃ³ipeÃ¡il go dtÃ fÃ³n pÃ³ca nÃ³ glÃ©asanna soghluaiste eile."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "NÃl aon droichead ar fÃ¡il faoi lÃ¡thair..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "B'fhÃ©idir gur chÃ³ir duit %s dul siar %s agus cineÃ¡l difriÃºil droichid a roghnÃº!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "CÃ©im %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ã?oslÃ³dÃ¡il %s BrabhsÃ¡laÃ Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "CÃ©im %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Faigh %s droichid %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "CÃ©im %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Anois %s cuir na droichid le BrabhsÃ¡laÃ Tor %s"
@@ -127,27 +141,27 @@ msgstr "Anois %s cuir na droichid le BrabhsÃ¡laÃ Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sN%sÃ theastaÃonn uaim ach droichid!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ardroghanna"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "NÃl"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "dada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sÃ¡!"
@@ -155,7 +169,7 @@ msgstr "%sT%sÃ¡!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sF%saigh Droichid"
@@ -199,7 +213,7 @@ msgstr "HÃ³ra a %s!"
 msgid "Hello, friend!"
 msgstr "Dia dhuit a chara!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Eochracha PoiblÃ"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr "TÃ¡ go leor gnÃ¡thdhroichead ar fÃ¡il mar chuid de BridgeDB freisin, droichid %s nach mbaineann ÃºsÃ¡id as cÃ³rais iompair ionphlugÃ¡ilte %s. B'fhÃ©idir nach bhfuil siad chomh spÃ©isiÃºil sin, ach cabhraÃonn siad leat cinsireacht IdirlÃn a sheachaint mar sin fÃ©in.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Cad is droichead ann?"
 
@@ -267,8 +281,8 @@ msgstr "TeastaÃonn uaim bealach malartach le droichid a fhÃ¡il!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Is fÃ©idir droichid a fhÃ¡il freisin trÃ rÃomhphost a sheoladh chuig %s. Caithfidh tÃº an teachtaireacht a sheoladh Ã³ cheann de na solÃ¡thraithe rÃomhphoist seo a leanas:\n%s, %s nÃ³ %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "NÃl mo chuid droichead ag obair! TÃ¡ cÃºnamh uaim!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mura bhfuil Tor ag obair duit, seol rÃomhphost chuig %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "DÃ©an iarracht an mÃ©id is mÃ³ eolais agus is fÃ©idir a sholÃ¡thar: na droichid agus na cÃ³rais iompair ionphlugÃ¡ilte a d'ÃºsÃ¡id tÃº, an leagan de do bhrabhsÃ¡laÃ Tor, teachtaireachtaÃ a chuir Tor amach, srl."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Seo do chuid lÃnte droichid:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Faigh Droichid!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Roghanna don chineÃ¡l droichid:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "An dteastaÃonn seoltaÃ IPv6 uait?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "An dteastaÃonn %s uait?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "NÃl do bhrabhsÃ¡laÃ ag taispeÃ¡int ÃomhÃ¡nna mar is ceart."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Cuir isteach na carachtair Ã³n ÃomhÃ¡ thuas..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Conas do chuid droichead a ÃºsÃ¡id"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr "Chun droichid a chur le BrabhsÃ¡laÃ Tor, ar dtÃºs oscail an %sleathanach ÃoslÃ³dÃ¡la%s, ansin lean na treoracha atÃ¡ ann leis an mbrabhsÃ¡laÃ a ÃoslÃ³dÃ¡il agus a thosÃº."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Nuair a osclaÃonn an fhuinneog 'Socruithe LÃonra Tor', cliceÃ¡il 'Cumraigh' agus lean an treoraÃ go dtÃ go bhfiafraÃonn sÃ©:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "An bhfuil do SholÃ¡thraÃ SeirbhÃse IdirlÃn (ISP) ag cur cosc ar, nÃ³ ag dÃ©anamh cinsireacht ar cheangail le LÃonra Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Roghnaigh 'TÃ¡' ansin cliceÃ¡il 'Ar Aghaidh'. Chun na droichid nua a chumrÃº, cÃ³ipeÃ¡il agus greamaigh na lÃnte droichid isteach sa mbosca ionchurtha. Ansin, cliceÃ¡il 'Ceangail' agus beidh gach uile rud rÃ©idh! MÃ¡ tharlaÃonn aon fhadhb, cliceÃ¡il an cnaipe 'Cabhair' sa treoraÃ 'Socruithe LÃonra Tor' chun tuilleadh eolais a fhÃ¡il."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "TaispeÃ¡nann sÃ© an teachtaireacht seo."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Iarr gnÃ¡thdhroichid."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Iarr droichid IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Iarr CÃ³ras Iompair IonphlugÃ¡ilte de rÃ©ir a CHINEÃ?L."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Faigh cÃ³ip den eochair phoiblÃ GnuPG a ÃºsÃ¡ideann BridgeDB."
diff --git a/gd/LC_MESSAGES/bridgedb.po b/gd/LC_MESSAGES/bridgedb.po
index 276c7328c..92bb89cba 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Mairi Macleod <mairi_mac9@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: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-03-31 23:19+0000\n"
-"Last-Translator: Mairi Macleod <mairi_mac9@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: gd\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Innis mu mhearachd"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ²d TÃ¹sail"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Clar-atharraich"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Cuir fios gu"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Tagh e uile"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Seall CÃ²d-QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ²d-QR airson do loidhnichean-drochaid"
 
@@ -67,58 +81,58 @@ msgstr "CÃ²d-QR airson do loidhnichean-drochaid"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Obh obh, brochan lom!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do ChÃ²d-QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Tha na loidhnichean drochaid agad sa ChÃ²d QR seo. Sganaich an cÃ²d leis an leughadair QR agad gus lethbhreac fhaighinn air na h-innealan eile a th' agad."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "'S dÃ²cha gum bu chÃ²ir dhut %s dol air ais %s fheuchainn agus drochaid eadar-dhealaichte a thaghadh!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ceum %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Luchdaich a-nuas %s Brabhsair Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ceum %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Faigh %s drochaidean %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ceum %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
@@ -127,27 +141,27 @@ msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sheir dhomh drochaidean!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Roghainnean adhartach"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Chan eil"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Chan eil gin"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sha!"
@@ -155,7 +169,7 @@ msgstr "%sT%sha!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sF%saigh Drochaidean"
@@ -199,7 +213,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo a charaid!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Iuchairichean Poblach"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr "Cuideachd, tha gu leÃ²r drochaidean Ã bhaisteach%s aig BridgeDB Ã s aonais\ndÃ²ighean siubhail Pluggable %snach eil cho tarraingeach, \nach a gheibheadh\nseachad air oidhirpean oifigeil gus casg a chur air beachdan mi-iomchaidh a sgaoileadh air an t-eadar-lion.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "De a th' ann an drochaidean?"
 
@@ -267,8 +281,8 @@ msgstr "Tha feum agam air dÃ²igh eile drochaidean fhaighinn!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "DÃ²igh eile drochaidean fhaighinn, 's e bhith a' cur post-dealan gu %s. Thoir fa-near gu bheil feum agad\nam post-dealan a chur, a' cleachdadh seÃ²ladh bho aon de na solaraichean post-dealain a leanas:\n%s, %s no %s. "
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mar nach eil an Tor agad ag obair, bu chÃ²ir dhut post-dealain a chur %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Feuch gun toir thu seachad na 's urrainn dhut de dh'fhiosrachaidh mun chÃ¹is, a' gabhail a-steach liosta de na\ndrochaidean agus dÃ¨ na dÃ²ighean siubhail Pluggable a chleachd thu, an dreach de Bhrabhsair Tor a tha agad,\nagus teachdaireachd sam bith a thug Tor a-mach, msaa.  "
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Seo do loidhnichean-drochaid:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Faigh Drochaidean!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "A bheil feum agad air seolaidhean-IPv6?"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "A bheil feum agad air seÃ²laidhean IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Am feum thu %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dÃ²igh cheart."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "SgrÃ¬obh a-steach na caractaran bhon Ã¬omhaigh gu h-Ã irde..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Mar a thÃ²isicheas tu a' cleachdadh do dhrochaidean"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr "Gus drochaidean a chur an luib Brabhsair Tor, an toiseach thig chun duilleig luchdachaidh%s airson %sBrabhsair Tor\nagus nuairsin, lean an stiÃ¹ireadh airson \nBrabhsair Tor \na luchdachadh a-nuas."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Nuair a nochdas am bucas-cÃ²mhraidh airson 'Seataidhean Lion-obrach Tor', tagh 'RÃ¨itich' agus lean\nan stiÃ¹ireadh gus am faighnich e: Â "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "An bheil an solaraiche eadar-lion (ISP) agad a' cur bacadh no caisg ann an dÃ²igh sam bith air ceanglaichean\nri lion-obrach Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Tagh 'Yes', agus an uair sin, 'Next'. Airson do dhrochaidean Ã¹r a rÃ¨iteachadh, ath-sgrÃ¬obh agus \ncuir na loidhnichean drochaid dhan a' bhucas teacsa. Mu dheireadh, tagh 'Connect', agus,\nle sin, bu chÃ²ir gum biodh tu deiseil. Ma bhios duilgheadas sam bith agad, tagh am putan 'Help', \na tha ri fhaighinn sna 'Seataidhean Lion-obrach Tor' airson barrachd cuideachadh agus stiÃ¹ireadh."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Seall an teachdaireachd seo."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Faighnich airson drochaidean vanilla."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Faighnich airson drochaidean IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Faigh lethbhreac den iuchar Gnupg phoblach aig BridgeDB."
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index b356b6dfc..e45f2f538 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Eu <luz.armas@xxxxxx>, 2014
 # manuel meixide <m.meixide@xxxxxxxxx>, 2013
 # Miguel Anxo Bouzada <mbouzada@xxxxxxxxx>, 2013
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-06 11:07+0000\n"
-"Last-Translator: Oscar Guardiola <Oscar.Guardiola@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "SentÃmolo! Algo foi mal coa sÃºa solicitude."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Informar dun Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Rexistro de Cambios"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Amosar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as sÃºas liÃ±as ponte"
 
@@ -71,58 +85,58 @@ msgstr "CÃ³digo QR para as sÃºas liÃ±as ponte"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ups!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Semella que houbo un erro obtendo o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©n as sÃºas liÃ±as ponte. EscanÃ©eo cun lector de cÃ³digos QR para copiar as sÃºas liÃ±as ponte nun mÃ³bil e outros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Non hai pontes dispoÃ±ibles agora mesmo..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Quizais deberÃa tentar %s indo hacia atrÃ¡s %s i elexindo un tipo de ponte diferente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Paso %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Descargar %s Tor Bowser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter as %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora %s engada as pontes ao Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "Agora %s engada as pontes ao Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sÃ³amente dame pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "OpciÃ³ns Avanzadas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ningÃºn"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%si!"
@@ -159,7 +173,7 @@ msgstr "%sS%si!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
@@ -203,7 +217,7 @@ msgstr "Ola, %s!"
 msgid "Hello, friend!"
 msgstr "Ola amigo/a!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB ten unha morea de pontes tradicionais de toda a vida %s sen ningÃºn\nTransporte Enchufable %s o que non pode sonar molÃ³n, pero todavÃa\naxudan a evitar a censura de internet en moitos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Que son os repetidores ponte?"
 
@@ -271,8 +285,8 @@ msgstr "Eu necesito un xeito alternativo de obter pontes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outro xeito de obter pontes e enviando un email a %s. Por favor teÃ±a en conta que debe\nenviar o email empregando unha direcciÃ³n dende un dos seguintes proveedores de email:\n%s, %s ou %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "As miÃ±as pontes non funcionan! Necesito axuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir tanta informaciÃ³n como poida acerca do seu caso, incluindo a lista de\npontes de Transportes Enchufables que tentou usar, a sÃºa versiÃ³n do Tor Browser,\ne calquera mensaxes que Tor dera, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Estas son as sÃºas liÃ±as ponte:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccione opciÃ³ns para o tipo de ponte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Necesita direcciÃ³ns IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necesita vostede un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador non estÃ¡ amosando imaxes adecuadamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Introduza os caracteres da imaxen de enrriba..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "CÃ³mo comenzar a usar as sÃºas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "Para introducir pontes no Tor Browser, primeiro vaia Ã¡ %s pÃ¡xina de descarga de\nTor Browser %s e siga as instrucciÃ³ns dadas para descargar e arrancar\no Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Cando apareza o diÃ¡logo 'Axustes de Rede de Tor', prema 'Configurar' e siga\no asistente ata que pregunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "O seu Porveedor de Servicios de Internet (ISP) bloquea ou censura conexiÃ³ns\nÃ¡ rede Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Seleccione 'Si' e prema en 'Seguinte'. Para configurar as sÃºas novas pontes, copie e\npegue as liÃ±as ponte na caixa de entrada de texto. Finalmente, prema 'Conectar', e\ndeberÃa poder comenzar! Se ten algÃºn problema, intente premendo o botÃ³n\n'Axuda' no asistente de 'Axustes de Rede de Tor' para axuda adicional."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Amosa esta mensaxe."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Solicitar pontes estÃ¡ndar."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Solicitar pontes IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Solicitar un Transporte Enchufable por TIPO."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter unha copia da clave pÃºblica GnuPG de BridgeDB."
diff --git a/gu/LC_MESSAGES/bridgedb.po b/gu/LC_MESSAGES/bridgedb.po
index 6252847c2..9b4e29df5 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Drashti Pandya <drashtipandya37@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: 2018-11-26 18:28+0000\n"
-"Last-Translator: Drashti Pandya <drashtipandya37@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "àª®àª¾àª« àª?àª°àª¶à«?! àª¤àª®àª¾àª°à«? àªµàª¿àª¨àª?àª¤à«? àª¸àª¾àª¥à«? àª?àª?àª?àª? àª?à«?àª?à«?àª? àª¥àª¯à«?àª?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "àª¸àª®àª¸à«?àª¯àª¾àª¨à«? àª?àª¾àª£ àª?àª°à«?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "àª¸à«?àª¤à«?àª°à«?àª¤ àª?à«?àª¡"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "àª¨à«?àª?àª§àª£à«?àª? àª¬àª¦àª²à«?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "àª¸àª?àªªàª°à«?àª? àª?àª°à«?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "àª¬àª§à«? àªªàª¸àª?àª¦ àª?àª°à«?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode àª¬àª¤àª¾àªµà«?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "àª¤àª®àª¾àª°à«? bridge àª²àª¾àª?àª¨à«?àª¸ àª®àª¾àª?à«? QRCode"
 
@@ -67,58 +81,58 @@ msgstr "àª¤àª®àª¾àª°à«? bridge àª²àª¾àª?àª¨à«?àª¸ àª®àª¾àª?à«? QRCode"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "àª?àªµà«?àª? àª²àª¾àª?à«? àª?à«? àª?à«? àª¤àª®àª¾àª°à«?àª? QRCode àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àªà«?àª² àª?àªµà«? àª¹àª¤à«?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "àª¹àª¾àª²àª®àª¾àª? àª?à«?àª? bridges àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "àªªàª?àª²à«?àª? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°à«? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "àªªàª?àª²à«?àª? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -127,27 +141,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "àª?àª¦à«?àª¯àª¤àª¨ àªµàª¿àª?àª²à«?àªªà«?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "àª¨àª¹àª¿"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "àª?àª?àª? àª¨àª¹à«?àª?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sàª¹àª¾%s"
@@ -155,7 +169,7 @@ msgstr "%sàª¹àª¾%s"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sàª®à«?%sàª³àªµà«? Bridges"
@@ -199,7 +213,7 @@ msgstr "àª¹àª¾àª¯, %s!"
 msgid "Hello, friend!"
 msgstr "àª¨àª®àª¸à«?àª¤à«?, àª®àª¿àª¤à«?àª°!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr ""
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr ""
 
@@ -267,7 +281,7 @@ msgstr "àª®àª¨à«? bridges àª®à«?àª³àªµàªµàª¾àª¨à«? àªµà«?àª?àª²à«?àªªàª¿àª? àª°
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "àª?à«? àª¤àª®àª¾àª°à«? Tor àª?àª¾àª® àª?àª°àª¤à«? àª¨àª¥à«?, àª¤à«? àª¤àª®àª¾àª°à«? àª?àª®à«?àª?àª² àª?àª°àªµà«? àª?à«?àª?àª? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "bridges àª®à«?àª³àªµà«?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index 61f5fb2d1..ab3f21a94 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # aharon, 2012
 # Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
 # Dvir Rosen <ndvnis@xxxxxxxxx>, 2014
@@ -19,17 +18,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-10-17 12:25+0000\n"
-"Last-Translator: ION\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "×¡×?×?×?×?! ×?×©×?×? ×?×©×ª×?×© ×?×?×§×©×? ×©×?×?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "×?×?×?×? ×¢×? ×ª×§×?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "×§×?×? ×?×§×?×¨"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "×?×?×?×? ×©×?× ×?×?×?×?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "×¦×?×¨ ×§×©×¨"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "×?×?×¨ ×?×?×?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "×?×¦×? ×§×?×? QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "×§×?×? QR ×?×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?"
 
@@ -77,58 +91,58 @@ msgstr "×§×?×? QR ×?×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "×?×?×? ×?×?×?×?×?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "× ×¨×?×? ×©× ×¤×?×? ×?×¢×?×ª ×?×§×?×?×ª ×§×?×? ×?-QR ×©×?×?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "×§×?×? QR ×?×? ×?×?×?×? ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?. ×¡×¨×?×§ ×?×?×ª×? ×?×?×?×¦×¢×?×ª ×§×?×¨×? ×§×?×? QR ×¢×? ×?× ×ª ×?×?×¢×ª×?×§ ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×? ×?×?×?×¤×?×? × ×?×?×? ×?×?×?×©×?×¨×?×? ×?×?×¨×?×?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "×?×?×? ×?×¨×?×¢ ×?×©×¨×?×? ×?×?×?× ×?×? ×?×?×©×?×?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "× ×¡×? ×?×?×?×?×¨ %s ×?×?×?×?×¨ %s ×?×?×?×?×?×¨ ×?×©×¨ ×?×¡×?×? ×?×?×¨!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "×©×?×? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "×?×?×¨×? ×?×ª %s ×?×¤×?×¤×? Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "×©×?×? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "×?×©×? %s ×?×©×¨×?×? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "×©×?×? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
@@ -137,27 +151,27 @@ msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s×¨%s×§ ×ª×? ×?×? ×?×©×¨×?×?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "×?×¤×©×¨×?×?×?×ª ×?×ª×§×?×?×?×ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "×?×?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "×?×£ ×?×?×?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s×?%s×?!"
@@ -165,7 +179,7 @@ msgstr "%s×?%s×?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s×§%s×?×? ×?×©×¨×?×?"
@@ -209,7 +223,7 @@ msgstr "×?×?×?, %s!"
 msgid "Hello, friend!"
 msgstr "×©×?×?×?, ×?×?×¨!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "×?×¤×ª×?×?×ª ×¦×?×?×?×¨×?×?×?"
 
@@ -259,7 +273,7 @@ msgid ""
 "\n"
 msgstr "×?× ×?×¡×£, ×?-BridgeDB ×?×© ×©×¤×¢ ×©×? ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×? ×?×?×?×?×? %s ×?×?×? ×?×¡×?×?×? ×ª×¢×?×?×¨×? ×?×?×©×?×? %s, ×?×? ×©×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?×¨ ×?×¢×§×?×£ ×¦× ×?×?×¨×ª ×?×?× ×?×¨× ×? ×?×?×§×¨×?×? ×¨×?×?×?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "×?×?×? ×?×©×¨×?×??"
 
@@ -277,8 +291,8 @@ msgstr "×?× ×? ×¦×¨×?×? ×?×¨×? ×?×?×?×¤×?×ª ×?×§×?×?×ª ×?×©×¨×?×?!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "×?×¨×? × ×?×¡×¤×ª ×?×?×©×?×? ×?×©×¨×?×? ×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s. ×?× ×? ×©×?×? ×?×? ×©×?×ª×? ×?×?×?×? ×?×©×?×?×? ×?×ª ×?×?×?×?×´×? ×¢\"×? ×©×?×?×?×© ×?×?×?×? ×?×¡×¤×§×? ×?×?×?×?\"×? ×?×?×?×?×?:\n%s, %s ×?×? %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×¦×¨×?×? ×¢×?×¨×?!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "×?×? Tor ×?×? ×¢×?×?×?, ×¢×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "× ×¡×? ×?×?×?×?×? ×?×?×? ×©×?×?×ª×¨ ×¤×¨×?×?×? ×¢×? ×?×?×§×¨×? ×©×?×? ×?×?×? ×?×?×?×?×ª×?, ×?×¨×?×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×?×?×¡×?×?×? ×?×ª×¢×?×?×¨×? ×?×?×ª×? × ×?×¡×?×ª, ×?×¨×¡×ª ×?×¤×?×¤×? Tor ×©×?×¨×©×?×ª×?, ×?×? ×?×?×?×¢×? ×?×ª×?×?×? ×©×?×ª×§×?×?×? ×?-Tor ×?×?×?×¡ ×?×?×¢×?×? ×?×?×? ×¤×¨×? × ×?×¡×£ ×©×¨×?×?×?× ×?×? ×?×¢×?× ×?×?."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "×?×?×?×? ×©×?×¨×?×ª ×?×?×©×¨ ×©×?×?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "×?×©×? ×?×©×¨×?×?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "×?× ×? ×?×?×¨ ×?×¤×©×¨×?×?×?×ª ×?×¡×?×? ×?×?×©×¨:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? ×?×ª×?×?×?×ª IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "×?×?×¤×?×¤×? ×©×?×? ×?×? ×?×¦×?×? ×ª×?×?× ×?×ª ×?×¨×?×?×?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "×?×?× ×¡ ×?×ª ×?×ª×?×?×?×? ×?×?×ª×?×?× ×? ×?×?×¢×?×?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "×?×?×? ×?×?×ª×?×?×? ×?×?×©×ª×?×© ×?×?×©×¨×?×? ×©×?×?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
 msgstr "×?×?×? ×?×?×?× ×?×¡ ×?×©×¨×?×? ×?×ª×?×? ×?×¤×?×¤×? Tor, ×¨×?×©×?×ª ×?×? ×?×? %s ×?×£ ×?×?×¨×?×ª ×?×¤×?×¤×? Tor %s ×?×?×?×?×¨ ×?×?×? ×¢×§×?×? ×?×?×¨ ×?×?×?×¨×?×?×ª ×¢×?×?×¨ ×?×?×¨×?×? ×?×?×ª×?×?×? ×©×? ×?×¤×?×¤×? Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "×?×?×©×¨ ×?×?×?Ö¾×©×?×? '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¦×?×¥, ×?×?×¥ ×¢×? '×?×?×?×¨' ×?×¢×§×?×? ×?×?×¨ ×?×?×©×£ ×¢×? ×©×?×?×? ×?×©×?×?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "×?×?×? ×¡×¤×§ ×©×?×¨×?×ª×? ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×¡×? ×?×? ×?×¦× ×?×¨ ×?×?×?×?×¨×?×? ×?×? ×¨×©×ª Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -365,28 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "×?×?×¨ '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?×ª×¦×¨ ×?×ª ×?×?×©×¨×?×? ×?×?×?×©×?×? ×©×?×?, ×?×¢×ª×§ ×?×?×?×?×§ ×?×ª ×©×?×¨×?×ª ×?×?×©×¨×?×? ×?×ª×?×? ×ª×?×?×ª ×?×§×?×? ×©×? ×?×?×?×?. ×?×?×¡×?×£, ×?×?×¥ ×¢×? '×?×ª×?×?×¨' ×?×?×ª×? ×?×?×?×¨ ×?×?×?×?×ª ×?×?×?×?! ×?×? ×ª×?×?×?×? ×ª×§×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ '×¢×?×¨×?' ×?×?×©×£ '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¡×?×?×¢ × ×?×¡×£."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "×?×¦×?×? ×?×?×?×¢×? ×?×?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "×?×§×© ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "×?×§×© ×?×©×¨×? IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "×?×§×© ×ª×¢×?×?×¨×? × ×ª×?×§×? ×¢\"×? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "×§×?×? ×¢×?×ª×§ ×©×? ×?×¤×ª×? ×?-GPG ×?×¦×?×?×?×¨×? ×©×? BridgeDB."
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index ab6b1beb7..49c89cbee 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A. Saad Imran, 2016
 # Bineet kumar gaur <bineetkumar@xxxxxxx>, 2014
 # Minnie Kaur <tuteja.minnie@xxxxxxxxx>, 2016
@@ -12,17 +11,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¤?à¥?à¤·à¤®à¤¾ à¤?à¤°à¥?à¤? ! à¤?à¤ªà¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤ªà¥?à¤°à¤¾ à¤¨à¤¹à¥?à¤? à¤?à¤¿à¤¯à¤¾ à¤?à¤¾ à¤¸à¤?à¤¾à¥¤ "
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à¤?à¤¿à¤¸à¥? à¤¤à¥?à¤°à¥?à¤?à¥? à¤?à¥? à¤¬à¤¾à¤°à¥?à¤? à¤®à¥?à¤? à¤¬à¤¤à¤¾à¤?à¤?à¥¤ "
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à¤¸à¤?à¤?à¥?à¤¤ à¤²à¤¿à¤ªà¤¿ à¤?à¤¾ à¤¸à¥?à¤¤à¥?à¤°à¥?à¤¤à¥¤"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨à¤¸à¥?à¤?à¥?à¥¤"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤?à¥¤"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¤¸à¤¬ à¤?à¥?à¤? à¤?à¥?à¤¨à¥?à¥¤ "
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRcode (à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡) à¤¦à¤¿à¤?à¤¾à¤?à¤?à¥¤ "
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? QRCode (à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡) à¤?à¤ªà¤?à¥? bridges lines (à¤¬à¥?à¤°à¤¿à¤? à¤²à¤¾à¤?à¤¨à¥?à¤¸) à¤?à¥? à¤²à¤¿à¤?à¥¤ "
 
@@ -70,58 +84,58 @@ msgstr "à¤¯à¥? à¤°à¤¹à¥? QRCode (à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡) à¤?à¤ªà¤?à¥? brid
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à¤?à¤°à¥? à¤¨à¤¹à¥?à¤? , à¤?à¥?à¤? à¤¸à¤¹à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¤?à¤¸à¤¾ à¤²à¤? à¤°à¤¹à¤¾ à¤¹à¥? à¤?à¤ªà¤?à¥? QRCode à¤?à¥? à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤?à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¥? à¤¹à¥?à¤?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¤¯à¤¹ QRCode à¤?à¤ªà¤?à¥? bridge lines à¤°à¤?à¤¤à¤¾ à¤¹à¥?à¤?. à¤?à¤ªà¤¨à¥? bridge lines à¤?à¥? à¤®à¥?à¤¬à¤¾à¤?à¤² à¤?à¤° à¤¦à¥?à¤¸à¤°à¥? à¤?à¤ªà¤?à¤°à¤£à¥?à¤? à¤®à¥?à¤? à¤ªà¥?à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤? à¤?à¤¸à¥? QRCode Reader à¤¸à¥? Scan à¤?à¤°à¥?à¤? ."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à¤?à¤¸ à¤¸à¤®à¤¯ à¤?à¥?à¤? bridge à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¹à¥?à¤? à¤¹à¥?à¤? ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¤¶à¤¾à¤¯à¤¦ à¤?à¤ªà¤?à¥? %sà¤ªà¥?à¤?à¥? à¤?à¤¾à¤?à¤° %sà¤¦à¥?à¤¬à¤¾à¤°à¤¾ à¤¸à¥? à¤¦à¥?à¤¸à¤°à¤¾ bridge type à¤?à¤¾ à¤?à¤¯à¤¨ à¤?à¤°à¤¨à¥? à¤?à¥? à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¤°à¤¨à¥? à¤?à¤¾à¤¹à¤¿à¤?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¤?à¤°à¤£ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤°à¥?à¤?."
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¤?à¤°à¤£ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s bridges %s à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤? "
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¤?à¤°à¤£ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¤?à¤¬ %s bridges à¤?à¥? Tor Browser à¤¸à¥? à¤?à¥?à¥?à¥?à¤? %s"
@@ -130,27 +144,27 @@ msgstr "à¤?à¤¬ %s bridges à¤?à¥? Tor Browser à¤¸à¥? à¤?à¥?à¥?à¥?à¤? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¤?à¥?à¤µà¤²%s bridges à¤¦à¥?à¤?à¤¿à¤¯à¥? !"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à¤?à¤¨à¥?à¤¨à¤¤ à¤µà¤¿à¤?à¤²à¥?à¤ª"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à¤¨à¤¹à¥?à¤?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à¤?à¥?à¤? à¤à¥? à¤¨à¤¹à¥?à¤?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¤?à¥?%s à¤¹à¤¾à¤?!"
@@ -158,7 +172,7 @@ msgstr "%sà¤?à¥?%s à¤¹à¤¾à¤?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%sridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤?."
@@ -202,7 +216,7 @@ msgstr "à¤?à¤°à¥?, %s!"
 msgid "Hello, friend!"
 msgstr "à¤¨à¤®à¤¸à¥?à¤¤à¥?, à¤¦à¥?à¤¸à¥?à¤¤!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? à¤?à¥?à¤?à¤?à¥?"
 
@@ -252,7 +266,7 @@ msgid ""
 "\n"
 msgstr "à¤?à¤¸à¤?à¥? à¤?à¤¤à¤¿à¤°à¤¿à¤?à¥?à¤¤, BridgeDB à¤?à¥? à¤ªà¤¾à¤¸ à¤?à¥?à¤? à¤¸à¤¾à¤§à¤¾à¤°à¤£ bridges %s à¤¬à¤¿à¤¨à¤¾ à¤?à¤¿à¤¨à¥?à¤¹à¥?à¤? Pluggable Transports %s\nà¤?à¥? à¤à¥? à¤¹à¥?à¤?.  à¤?à¥? à¤?à¤¿ à¤¸à¥?à¤¨à¤¨à¥? à¤®à¥?à¤? à¤?à¤¤à¤¨à¥? à¤?à¤?à¥?à¤?à¥? à¤¨à¤¹à¥?à¤? à¤¹à¥? à¤²à¥?à¤?à¤¿à¤¨ à¤«à¤¿à¤° à¤à¥? à¤¯à¥?\nà¤?à¥?à¤? à¤®à¤¾à¤®à¤²à¥? à¤®à¥?à¤? à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥?à¤?à¤¸à¤°à¤¶à¤¿à¤ª à¤?à¥? à¤°à¥?à¤? à¤¸à¤?à¤¤à¥? à¤¹à¥?à¤?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "bridges à¤?à¥?à¤¯à¤¾ à¤¹à¥?à¤??"
 
@@ -270,8 +284,8 @@ msgstr "à¤®à¥?à¤?à¥? Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¨à¥? à¤?à¤¾ à¤?à¤¨à¥?à¤¯ à¤¤à¤°à¥?à¤?à¤¾ %s à¤?à¥? à¤?à¤? à¤?à¤®à¥?à¤² à¤à¥?à¤?à¤¨à¤¾ à¤¹à¥?à¤?. à¤?à¥?à¤ªà¤¯à¤¾ à¤§à¥?à¤¯à¤¾à¤¨ à¤¦à¥?à¤? à¤?à¤¿ à¤?à¤ªà¤?à¥? à¤¯à¤¹ \nà¤?à¤®à¥?à¤², à¤¨à¤¿à¤®à¥?à¤¨ à¤®à¥?à¤? à¤¸à¥? à¤?à¤¿à¤¸à¥? à¤?à¤¿à¤¸à¥? à¤à¥? à¤?à¤? à¤?à¤®à¥?à¤² à¤ªà¥?à¤°à¤¦à¤¾à¤¤à¤¾ à¤?à¥? à¤?à¤¡à¥?à¤°à¥?à¤¸ à¤¸à¥? à¤à¥?à¤?à¤¨à¤¾ à¤¹à¥?à¤?à¤¾:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "à¤®à¥?à¤°à¥? Bridges à¤?à¤¾à¤® à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¥? à¤¹à¥?! à¤®
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à¤¯à¤¦à¤¿ à¤?à¤ªà¤?à¤¾ Tor à¤?à¤¾à¤® à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¤¾ à¤¹à¥? à¤¤à¥? à¤?à¤ªà¤?à¥? %s à¤ªà¤° à¤?à¤®à¥?à¤² à¤à¥?à¤?à¤¨à¤¾ à¤?à¤¾à¤¹à¤¿à¤?."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à¤?à¤ªà¤?à¥? à¤®à¤¾à¤®à¤²à¥? à¤®à¥?à¤? à¤?à¤§à¤¿à¤? à¤¸à¥? à¤?à¤§à¤¿à¤? à¤?à¤¾à¤¨à¤?à¤¾à¤°à¥? à¤¦à¥?à¤¨à¥? à¤?à¤¿ à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¥?à¤?à¤¿à¤¯à¥?, à¤?à¥?à¤¸à¥? à¤?à¤¿ à¤?à¤¨ bridges à¤?à¤° Pluggable Transports à¤?à¥? à¤¸à¥?à¤?à¥?\nà¤?à¤¿à¤¨à¥?à¤¹à¥?à¤? à¤?à¤ªà¤¨à¥? à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤°à¤¨à¥? à¤?à¥? à¤?à¥?à¤¶à¤¿à¤¶ à¤?à¥?, à¤?à¤ªà¤?à¥? Tor Browser à¤?à¤¾ à¤¸à¤?à¤¸à¥?à¤?à¤°à¤£, \nà¤?à¤° à¤?à¤¸à¥? à¤?à¥?à¤? à¤®à¥?à¤¸à¥?à¤? à¤?à¥? Tor à¤¨à¥? à¤¦à¤¿à¤? à¤¹à¥?, à¤?à¤¦à¤¿."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? à¤?à¤ªà¤?à¥? bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¤¾à¤?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¥?à¤?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "à¤?à¥?à¤ªà¤¯à¤¾ Bridge à¤?à¥? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤?à¤¾ à¤µà¤¿à¤?à¤²à¥?à¤ª à¤?à¥?à¤¨à¤¿à¤?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? IPv6 à¤ªà¤¤à¥?à¤? à¤?à¥? à¤?à¤°à¥?à¤°à¤¤ à¤¹à¥??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? %s à¤?à¤¾à¤¹à¤¿à¤??"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "à¤?à¤ªà¤?à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¥?à¤° à¤«à¥?à¤?à¥?à¤? à¤?à¥? à¤ à¥?à¤? à¤¸à¥? à¤ªà¥?à¤°à¤¦à¤°à¥?à¤¶à¤¿à¤¤ à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¤¾ à¤¹à¥?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "à¤?à¤ªà¤° à¤?à¥? à¤?à¤¿à¤¤à¥?à¤° à¤¸à¥? à¤?à¤?à¥?à¤·à¤° à¤¡à¤¾à¤²à¥?."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à¤?à¤ªà¤?à¥? bridges à¤?à¥? à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤°à¤¨à¤¾ à¤?à¥?à¤¸à¥? à¤¶à¥?à¤°à¥? à¤?à¤°à¥?à¤??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
 msgstr "Tor Browser à¤®à¥?à¤? bridges à¤®à¥?à¤? à¤ªà¥?à¤°à¤µà¥?à¤¶ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, à¤¸à¤¬à¤¸à¥? à¤ªà¤¹à¤²à¥? %s Tor Browser à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤ªà¥?à¤? à¤ªà¤° à¤?à¤¾à¤?à¤?\n%s à¤?à¤° à¤?à¤¸à¤?à¥? à¤¬à¤¾à¤¦ à¤µà¤¹à¤¾à¤? à¤ªà¤° Tor Browser à¤?à¥? à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤° à¤¶à¥?à¤°à¥? à¤?à¤°à¤¨à¥? à¤?à¥? à¤¨à¤¿à¤°à¥?à¤¦à¥?à¤¶à¥?à¤? à¤?à¤¾ à¤ªà¤¾à¤²à¤¨ à¤?à¤°à¥?à¤?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "à¤?à¤¬ \"Tor à¤¬à¥?à¤°à¤¾à¤?à¥?à¤° à¤¸à¥?à¤?à¤¿à¤?à¤?\" à¤?à¤¾ à¤¡à¤¾à¤¯à¤²à¥?à¤? à¤¸à¤¾à¤®à¤¨à¥? à¤?à¤¯à¥?, à¤¤à¤¬ \"configure\" à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤? à¤¤à¤¥à¤¾ à¤ªà¥?à¤°à¥? à¤ªà¥?à¤°à¤?à¥?à¤°à¤® à¤?à¤¾ à¤ªà¤¾à¤²à¤¨ à¤?à¤°à¥?à¤? à¤?à¤¬ à¤¤à¤? à¤¯à¤¹ à¤¯à¥? à¤¨à¤¹à¥?à¤? à¤ªà¥?à¤?à¥?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¤¾  à¤?à¤¨à¥?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥?à¤µà¤¾ à¤ªà¥?à¤°à¤¦à¤¾à¤¤à¤¾ (ISP)\n Tor à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥? à¤¸à¤?à¤ªà¤°à¥?à¤? à¤ªà¤° à¤ªà¤¾à¤¬à¤¨à¥?à¤¦à¥? à¤²à¤?à¤¾à¤¤à¤¾ à¤¹à¥? ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -358,28 +362,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à¤¹à¤¾à¤?' à¤?à¥?à¤¨à¥? à¤?à¤° à¤¤à¤¬ 'à¤?à¤?à¥?' à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤?. à¤?à¤ªà¤¨à¥? à¤¨à¤? bridges à¤?à¥? configure à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¥?à¤? \nà¤?à¥? à¤?à¥?à¤ªà¥? à¤?à¤°à¤?à¥?  à¤?à¥?à¤?à¥?à¤¸à¥?à¤? à¤?à¤¨à¤ªà¥?à¤? à¤¬à¥?à¤?à¥?à¤¸à¤®à¥?à¤? à¤ªà¥?à¤¸à¥?à¤? à¤?à¤° à¤¦à¥?à¤?. à¤?à¤?à¤¤ à¤®à¥?à¤?,\"à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤?\" à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤¸à¤¬ à¤?à¥?à¤? à¤?à¤ªà¤¨à¥? à¤?à¤ª à¤¹à¥? à¤?à¤¾à¤?à¤?à¤¾. \nà¤¯à¤¦à¤¿ à¤?à¤ªà¤?à¥? à¤¸à¤¾à¤®à¤¨à¥? à¤?à¥?à¤? à¤ªà¤°à¥?à¤¶à¤¾à¤¨à¥?\nà¤?à¤¯à¥? à¤¤à¥?  à¤?à¤?à¥? à¤?à¥? à¤¸à¤¹à¤¾à¤¯à¤¤à¤¾ à¤?à¥? à¤²à¤¿à¤? Tor à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥?à¤?à¤¿à¤?à¤? à¤®à¥?à¤? \"à¤®à¤¦à¤¦\" à¤¬à¤?à¤¨ à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤° à¤¦à¥?à¤?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à¤¯à¤¹ à¤¸à¤¨à¥?à¤¦à¥?à¤¶ à¤¦à¤¿à¤?à¤¾à¤?à¤?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "vanilla bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE à¤?à¥? à¤¦à¥?à¤µà¤¾à¤°à¤¾ Pluggable Transport à¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤?à¤°à¥?à¤?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB à¤?à¥? à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? GnuPG à¤?à¥?à¤?à¤?à¥? à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¥?à¤?."
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index 66b463939..08ab2508f 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Joziah Cameron <cambergeron55@xxxxxxxxx>, 2016
 # Nikola Parsifal <anchorsound@xxxxxxxxx>, 2014
 # Nives Miletic <nives.miletic@xxxxxxxxx>, 2018
@@ -12,17 +11,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-17 20:44+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! NeÅ¡to je poÅ¡lo po krivu s VaÅ¡im zahtjevom."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Prijavite greÅ¡ku"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Izvorni kod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Zapisnik o promjenama"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Odaberi sve"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PokaÅ¾i QR kod"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kod za VaÅ¡e linije mostova"
 
@@ -70,58 +84,58 @@ msgstr "QR kod za VaÅ¡e linije mostova"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "O ne, greÅ¡ka!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju VaÅ¡eg QR koda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ovaj QR kod sadrÅ¾i VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ?aje."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno nema dostupnih mostova..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾da bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Korak %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Preuzmi %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Preuzmi %s mostove %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sad %s dodaj mostove u Tor Browser %s"
@@ -130,27 +144,27 @@ msgstr "Sad %s dodaj mostove u Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo mi daj mostove!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Napredne opcije"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "niÅ¡ta"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -158,7 +172,7 @@ msgstr "%sD%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sreuzmi mostove"
@@ -202,7 +216,7 @@ msgstr "Bok, %s!"
 msgid "Hello, friend!"
 msgstr "Bok, prijatelju!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni kljuÄ?evi"
 
@@ -252,7 +266,7 @@ msgid ""
 "\n"
 msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji moÅ¾da ne zvuÄ?e prezanimljivo, ali mogu\npomoÄ?i zaobiÄ?i Internet cenzuru u mnogo sluÄ?ajeva.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Å to su mostovi?"
 
@@ -270,8 +284,8 @@ msgstr "Trebam alternativni naÄ?in preuzimanja mostova!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "JoÅ¡ jedan naÄ?in za preuzimanje mostova je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih davatelja email usluge: %s, %s ili %s."
+"%s or %s."
+msgstr "JoÅ¡ jedan naÄ?in za dobiti mostove je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih email providera:\n%s ili %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Moji mostovi ne rade! Treba mi pomoÄ?!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ako VaÅ¡ Tor ne radi, poÅ¡aljite email na %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PokuÅ¡ajte ukljuÄ?iti Å¡to viÅ¡e informacija o svom sluÄ?aju, ukljuÄ?ujuÄ?i popis\nmostova i prikljuÄ?nih transporta koje ste pokuÅ¡ali koristiti, verziju svog Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ovo su linije vaÅ¡ih mostova:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Preuzmite mostove!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Molimo odaberite opcije za tip mosta:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Trebaju li Vam IPv6 adrese?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trebate li %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ preglednik ne prikazuje slike ispravno."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Unesite znakove sa slike iznad..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kako poÄ?eti koristite mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
 msgstr "Kako bi unijeli mostove u Tor Browser, prvo posjetite %s Tor Browser stranicu\nza preuzimanje %s, a zatim slijedite upute za preuzimanje i pokretanje\nTor Browsera."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kad se pojavi dijaloÅ¡ki okvir 'Postavke Tor mreÅ¾e', kliknite 'Konfiguriraj' i slijedite\nÄ?arobnjaka dok ne upita:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokira li VaÅ¡ Internet Service Provider (ISP - pruÅ¾atelj internet usluge) ili ikako drugaÄ?ije cenzurira veze\ns Tor mreÅ¾om?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -358,28 +362,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Odaberite 'Da', a zatim 'SljedeÄ?e'. Da bi konfigurirali svoje nove mostove, kopirajte i \nzalijepite linije mostova u kuÄ?icu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiÄ?ete na probleme, probajte kliknuti  'PomoÄ?'\nu Ä?arobnjaku 'Postavke Tor mreÅ¾e' za daljnju pomoÄ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Prikazuje ovu poruku."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "ZatraÅ¾i dobre, stare mostove."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "ZatraÅ¾i IPv6 mostove."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ZatraÅ¾i prikljuÄ?ni transport po tipu."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG kljuÄ?a."
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index c13cb3c70..96e53cff5 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # benewfy <benewfy@xxxxxxxxx>, 2015
 # Blackywantscookies, 2014
 # Lajos Pasztor <mrlajos@xxxxxxxxx>, 2014
@@ -14,17 +13,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-12-28 15:07+0000\n"
-"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "ElnÃ©zÃ©st! Valami rosszul mÅ±kÃ¶dÃ¶tt a kÃ©rÃ©sed kÃ¶zben."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Hiba jelentÃ©se"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ForrÃ¡s kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "VÃ¡ltozÃ¡sok"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Mindent kijelÃ¶l"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR KÃ³d megjelenÃtÃ©se"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR KÃ³d a hÃd sorokhoz"
 
@@ -72,58 +86,58 @@ msgstr "QR KÃ³d a hÃd sorokhoz"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "HoppÃ¡!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ã?gytÅ±nik a QR KÃ³d hibÃ¡s."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ez a QR KÃ³d a hÃd sorait tartalmazza. Olvassa be egy QR KÃ³d olvasÃ³val, hogy Ã¡tmÃ¡solja a HÃd sorokat mobil Ã©s egyÃ©b eszkÃ¶zeire."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Jelenleg nincsenek rendelkezÃ©sre Ã¡llÃ³ hidak..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "TalÃ¡n megprÃ³bÃ¡lhatnÃ¡l %s vissza menni %s Ã©s mÃ¡sik HÃd tÃpust vÃ¡lasztani."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "LÃ©pÃ©s %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "LetÃ¶ltÃ©s %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "LÃ©pÃ©s %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Hidak %s beszerzÃ©se"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "LÃ©pÃ©s %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor Browser-hez %s"
@@ -132,27 +146,27 @@ msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor Browser-hez %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%ssak adjÃ¡l mÃ¡r nekem hidakat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "HaladÃ³ beÃ¡llÃtÃ¡sok"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nem"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Semmi"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%szeretnÃ©k!"
@@ -160,7 +174,7 @@ msgstr "%sS%szeretnÃ©k!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%szerezni Bridge -et!"
@@ -204,7 +218,7 @@ msgstr "HÃ©, %s!"
 msgid "Hello, friend!"
 msgstr "Hello!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "NyilvÃ¡nos kulcsok"
 
@@ -254,7 +268,7 @@ msgid ""
 "\n"
 msgstr "Ezen felÃ¼l, BridgeDB -nek van sok rÃ©gi mÃ³di \"vanÃlia\"  hÃdjai %s melyek CsatlakoztathatÃ³ SzÃ¡llÃtÃ³k %s nÃ©lkÃ¼l vannak\nmely talÃ¡n nem hallatszik szuperÃ¼l, de Å?k mÃ©g mindig\ntudnak segÃteni kikerÃ¼lni az internet cenzÃºrÃ¡jÃ¡t.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Mik is a Hidak?"
 
@@ -272,8 +286,8 @@ msgstr "SzÃ¼ksÃ©gem van egy alternatÃv mÃ³dra a Hidak beszerzÃ©sÃ©hez!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Egy mÃ¡sik mÃ³dja, hogy megkapd a bridge listÃ¡t kÃ¼ldj emailt a %s cÃmre. KÃ©rlek vedd figyelembe\naz emailt az alÃ¡bbi email szolgÃ¡ltatÃ³ cÃmekrÅ?l kÃ¼ldd:\n%s, %s or %s."
+"%s or %s."
+msgstr "MÃ¡sik mÃ³dszer hidak beszerzÃ©sÃ©re email kÃ¼ldÃ©sÃ©vel lehetsÃ©ges a %s cÃmre. \nKÃ©rem vegye figyelembe azt hogy az email kÃ¼ldÃ©sÃ©hez hasznÃ¡ljon egyet az alÃ¡bbi email szolgÃ¡ltatÃ³k kÃ¶zÃ¼l. \n%s vagy %s"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "A HÃdjaim nem mÅ±kÃ¶dnek! SegÃtsÃ©gre van szÃ¼ksÃ©gem!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor bÃ¶ngÃ©szÅ?je nem mÅ±kÃ¶dik, akkor kÃ¼ldjÃ¶n egy email-t %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ³bÃ¡ljon minÃ©l tÃ¶bb informÃ¡ciÃ³t megadni amennyit csak tud, beleÃ©rtve a listÃ¡jÃ¡t \na %s hidaknak Ã©s Pluggable Transports -nak, amelyet hasznÃ¡lni prÃ³bÃ¡lt, A Tor Browser verziÃ³jÃ¡t,\nÃ©s minden Ã¼zenetet melyet Tor adott ki, stb."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Itt vannak a hÃd soraid:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Hidak szerzÃ©se!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "KÃ©rjÃ¼k, vÃ¡lasszon opciÃ³t a hÃd tÃpushoz:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Kellenek Ã¶nnek IPv6 cÃmek?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "SzÃ¼ksÃ©ge van egy %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ez a bÃ¶ngÃ©szÅ? nem jelenÃti meg a kÃ©peket rendesen."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Adja meg a karaktereket amik a fenti kÃ©pen lÃ¡thatÃ³ak ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Hogyan kezdjÃ¼k hasznÃ¡lni a hidat "
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
 msgstr "A hidak beÃ¡llÃtÃ¡sÃ¡hoz a Tor Browser-ben, elÅ?szÃ¶r lÃ¡togasson el a %s Tor bÃ¶ngÃ©szÅ? letÃ¶ltÃ©s oldalra %s Ã©s kÃ¶vesse az ÃºtmutatÃ¡st a Tor bÃ¶ngÃ©szÅ? letÃ¶ltÃ©sÃ©rÅ?l Ã©s hasznÃ¡latÃ¡rÃ³l."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Amikor a 'Tor HÃ¡lÃ³zati BeÃ¡llÃtÃ¡sok' dialÃ³gus felugrik, kattintson a 'KonfigurÃ¡lÃ¡s'-ra Ã©s kÃ¶vesse\na varÃ¡szlÃ³t amÃg az kÃ©ri hogy:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkolja vagy cenzÃºrÃ¡zza az Ã¶n internet szolgÃ¡ltatÃ³ja (ISP) a kapcsolatokat\na Tor hÃ¡lÃ³zatÃ¡hoz?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -360,28 +364,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "VÃ¡lassza hogy 'Igen' Ã©s utÃ¡na kattintson a 'KÃ¶vetkezÅ?\"-re. Az Ã¶n Ãºj hidjai konfigurÃ¡sÃ¡hoz, mÃ¡solja\nÃ©s illessze be a HÃd sorokat a felugrÃ³ ablakba. VÃ©gÃ¼l, kattintson 'KapcsolÃ³dÃ¡s'-ra, Ã©s \nmÃ¡r kÃ©szen is van. Ha valamilyen hibÃ¡t tapasztal, prÃ³bÃ¡ljon a 'SegÃtsÃ©g'\n gombra kattintani a 'Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok' varÃ¡zslÃ³ban a tobÃ¡bbi segÃtsÃ©gÃ©rt."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "MegjelenÃti ezt az Ã¼tenetet."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Nem csatlakoztathatÃ³ szÃ¡llÃtÃ³ hÃd kÃ©relme."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPV6 hÃd kÃ©rÃ©se."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Egy csatlakoztathatÃ³ szÃ¡llÃtÃ³ kÃ©relme TYPE szerint."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "MÃ¡solat szertÃ©se a BridgeDB's publikus GnuPG kulcsÃ¡bÃ³l."
diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po
index 4fb5abb38..818ad61b5 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Hrach Mkrtchyan <mhrach87@xxxxxxxxx>, 2016
 # Sarkis Andreyan <sarkis.andreyan@xxxxxxxxx>, 2017
 # Sergei <serjsafarian@xxxxxxxxx>, 2018
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-15 05:53+0000\n"
-"Last-Translator: Sergei <serjsafarian@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?Õ¡Õ¾:"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Õ?Õ¡ÕµÕ¿Õ¶Õ¥Õ¬ Õ½ÕÕ¡Õ¬Õ« Õ´Õ¡Õ½Õ«Õ¶"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¸Õ¤"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Õ?Õ¸Ö?Õ¸ÕÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö?Õ« Õ´Õ¡Õ¿ÕµÕ¡Õ¶"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ô¿Õ¡Õº"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ô¸Õ¶Õ¿Ö?Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö?Õ¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Õ?Õ¸Ö?Ö?Õ¡Õ¤Ö?Õ¥Õ¬ QR Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö?Õ¨"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-Õ¯Õ¸Õ¤Õ¨Õ? Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?"
 
@@ -69,58 +83,58 @@ msgstr "QR-Õ¯Õ¸Õ¤Õ¨Õ? Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Õ?Ö?Ö?, Õ´Õ« Õ¢Õ¡Õ¶ Õ¶Õ¥Õ¶Ö? Õ¹Õ¥Õ²Õ¡Õ¾:"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ô¿Õ¡Ö?Õ®Õ¥Õ½ Õ©Õ¥ Õ½ÕÕ¡Õ¬ Õ¿Õ¥Õ²Õ« Õ¸Ö?Õ¶Õ¥Ö?Õ¡Õ¾ Õ?Õ¥Ö? QR-Õ¯Õ¸Õ¤Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ«Õ½Ö?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ô±ÕµÕ½ QR-Õ¯Õ¸Õ¤Õ¨ ÕºÕ¡Ö?Õ¸Ö?Õ¶Õ¡Õ¯Õ¸Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨Ö? Õ?Õ¯Õ¡Õ¶Õ¡Õ¾Õ¸Ö?Õ¥Ö? Õ¡ÕµÕ¶ QR-Õ¯Õ¸Õ¤Õ¥Ö?Õ« Õ¨Õ¶Õ©Õ¥Ö?Ö?Õ«Õ¹Õ¸Õ¾Õ? Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Õ·Õ¡Ö?ÕªÕ¡Õ¯Õ¡Õ¶ Ö? Õ¡ÕµÕ¬ Õ½Õ¡Ö?Ö?Õ¥Ö?Õ¸Ö?Õ´ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö?Ö?"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ô±ÕµÕªÕ´ Õ¸Õ¹ Õ´Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ» Õ¹Õ¯Õ¡â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Õ?Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö?, Õ¡Ö?ÕªÕ¥ Ö?Õ¸Ö?Õ±Õ¥Õ¬ %s Õ¾Õ¥Ö?Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ %s Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ´Õ« Õ¡ÕµÕ¬ Õ¿Õ¥Õ½Õ¡Õ¯Ö?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Õ?Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ %sÂ«TorÂ» Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ¨%s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ %s Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ«Õ¶%s"
@@ -129,27 +143,27 @@ msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÕ?%sÕ¡Ö?Õ¦Õ¡ÕºÕ¥Õ½ Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Ö?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ô¼Ö?Õ¡Ö?Õ¸Ö?Ö?Õ«Õ¹ Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö?Õ¥Ö?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Õ?Õ¹"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Õ¢Õ¡Ö?Õ¡Õ¯Õ¡ Õ§"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÔ±%sÕµÕ¸Ö?"
@@ -157,7 +171,7 @@ msgstr "%sÔ±%sÕµÕ¸Ö?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÕ?%sÕ¿Õ¡Õ¶Õ¡Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶"
@@ -201,7 +215,7 @@ msgstr "Õ?Õ¥Õ?Õµ, %sÖ?"
 msgid "Hello, friend!"
 msgstr "Ô²Õ¡Ö?Ö?Õ?, Õ¨Õ¶Õ¯Õ¥Ö?Õ½:"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Õ?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö?"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "Õ?Õ¡Õ¾Õ¥Õ¬Õ¥Õ¶Ö?, Õ¸Ö? BridgeDB-Õ¶ Õ¸Ö?Õ¶Õ« Õ¶Õ¡Ö? Õ¢Õ¡Õ¦Õ¸Ö?Õ´ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?, Õ¸Ö?Õ¸Õ¶Ö? Õ¹Õ¥Õ¶ Õ¡Õ»Õ¡Õ¯Ö?Õ¸Ö?Õ´\n%s Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ¸Ö?Õ´Õ¨ %s, Õ«Õ¶Õ¹Õ¨ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ¦Õ¤Õ¥Õ¬ Õ¯Õ¡ÕµÖ?Õ« Õ§Õ»Õ« Õ¿Õ¥Õ½Ö?Õ« Õ¾Ö?Õ¡,\nÕ¢Õ¡ÕµÖ? Õ·Õ¡Õ¿ Õ¤Õ¥ÕºÖ?Õ¥Ö?Õ¸Ö?Õ´ Õ¯Õ¡Ö?Õ¸Õ² Õ¥Õ¶ Ö?Õ£Õ¶Õ¥Õ¬  Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ô»Õ?Õ¶Õ¹ Õ¥Õ¶ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨Ö?"
 
@@ -269,8 +283,8 @@ msgstr "Ô»Õ¶Õ± ÕºÕ¥Õ¿Ö? Õ§ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö?  Õ¡ÕµÕ¬ Õ¥Õ²Õ¡
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ô¿Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö? Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯ Õ§ Õ§Õ¬. Õ¶Õ¡Õ´Õ¡Õ¯ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Õ¬Õ¨ %s Õ°Õ¡Õ½Ö?Õ¥Õ«Õ¶Ö?\nÕ?Õ¡Õ·Õ¾Õ« Õ¡Õ¼Õ¥Ö?, Õ¸Ö? Ô´Õ¸Ö?Ö? ÕºÕ¥Õ¿Ö? Õ§ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Ö? Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯Õ¨ Õ°Õ¥Õ¿Ö?ÕµÕ¡Õ¬\nÕ§Õ¬. Ö?Õ¸Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ´Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¶Õ¥Ö?Õ«Ö? Õ¸Ö?Ö?Õ§ Õ´Õ¥Õ¯Õ« Õ´Õ«Õ»Õ¸Ö?Õ¸Õ¾.\n%s,%s Õ¯Õ¡Õ´ %sÖ?"
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Ô»Õ´ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ Õ¹Õ¥Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´Ö? Ô»Õ¶Õ± Ö?Õ£Õ¶Õ¸Ö?
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ÔµÕ©Õ¥ Õ?Õ¥Ö? Tor-Õ¨ Õ¹Õ« Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´, ÕºÕ¥Õ¿Ö? Õ§ Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Õ¬ %s: "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Õ?Õ¸Ö?Õ±Õ¥Ö? Õ¶Õ¥Ö?Õ¡Õ¼Õ¥Õ¬ Õ¸Ö?Ö?Õ¡Õ¶ Õ°Õ¶Õ¡Ö?Õ¡Õ¾Õ¸Ö? Õ§ Õ·Õ¡Õ¿ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö? Õ?Õ¥Ö? Õ¤Õ¥ÕºÖ?Õ« Õ¾Õ¥Ö?Õ¡Õ¢Õ¥Ö?ÕµÕ¡Õ¬, Õ¶Õ¥Ö?Õ¡Õ¼ÕµÕ¡Õ¬ Õ¡ÕµÕ¶ bridge-Õ¶Õ¥Ö?Õ«\nÖ? Pluggable Transport-Õ¶Õ¥Ö?Õ« Ö?Õ¡Õ¶Õ¯Õ¨, Õ¸Ö?Õ¸Õ¶Ö? Ö?Õ¸Ö?Õ±Õ¥Õ¬ Õ¥Ö? Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬, Õ?Õ¥Ö? Tor Browser-Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¨,\n Ö?Õ¡Õ¶Õ¯Õ¡Ö?Õ¡Õ® Õ¡ÕµÕ¬ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶, Õ¸Ö? Tor-Õ¨ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¥Õ¬ Õ§ Õ?Õ¥Õ¦, Ö? Õ¡ÕµÕ¬Õ¶:"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ô±Õ°Õ¡ Õ?Õ¥Ö? bridge line-Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Õ?Õ¿Õ¡Ö?Õ¥Õ?Ö? Bridge-Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ bridge-Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¶Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ¥Õ¶ IPv6 Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ§ %s:"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Õ?Õ¥Ö? Õ¢Ö?Õ¡Õ¸Ö?Õ¦Õ¥Ö?Õ¨ Õ¶Õ¯Õ¡Ö?Õ¶Õ¥Ö?Õ¨ Õ³Õ·Õ¿Õ¸Ö?Õ¥Õ¶ Ö?Õ¸Ö?ÕµÖ? Õ¹Õ« Õ¿Õ¡Õ¬Õ«Õ½:"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ?Ö? Õ¿Õ¡Õ¼Õ¡Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö?Õ¨ Õ¾Õ¥Ö?Ö?Õ« Õ¶Õ¯Õ¡Ö?Õ«Ö?:"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ô»Õ¶Õ¹ÕºÕ¥Õ?Õ½ Õ½Õ¯Õ½Õ¥Õ¬ Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬ Õ?Õ¥Ö? bridge-Õ¶Õ¥Ö?Õ¨:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? bridge-Õ¶Õ¥Ö?Õ¨ Tor Browser, Õ¶Õ¡Õ Õ´Õ¿Õ¥Õ?Ö? %sTor Browser-Õ« Õ¶Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ§Õ»Õ¨%s Ö? Õ°Õ¥Õ¿Ö?Õ¥Õ?Ö? Õ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶Õ? Õ¶Õ¥Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö? Ö? Õ£Õ¸Ö?Õ®Õ¡Ö?Õ¯Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Tor Browser-Õ¨:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ÔµÖ?Õ¢ Â«Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Â»-Õ¨ Õ¢Õ¡Ö?Õ¾Õ«Õ? Õ½Õ¥Õ²Õ´Õ¥Ö? Â«Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Â» Ö? Õ°Õ¥Õ¿Ö?Õ¥Ö?\nÕ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶ Õ´Õ«Õ¶Õ¹Ö? Õ¡ÕµÕ¶ Õ°Õ¡Ö?Ö?Õ¶Õ«."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Õ?Õ¥Ö? Ô»Õ¶Õ¿Õ¥Ö?Õ¶Õ¥Õ¿ Ô¾Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö? Õ?Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¨ (ISP) Õ¡Ö?Õ£Õ¥Õ¬Õ¡Ö?Õ¡Õ¯Õ¸Ö?Õ´ Õ¯Õ¡Õ´ Õ°Õ¥Õ¿Õ¡Ö?Õ¶Õ¶Õ¸Õ?Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ´Õ«Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨\nTor Ö?Õ¡Õ¶Ö?Õ«Õ¶:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Õ?Õ¥Õ²Õ´Õ¥Ö? Â«Ô±ÕµÕ¸Â», Õ«Õ½Õ¯ Õ°Õ¥Õ¿Õ¸ Â«Õ?Õ¡Õ»Õ¸Ö?Õ¤Õ¨Â»: Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Õ?Õ¥Ö? Õ¶Õ¸Ö? bridge-Õ¶Õ¥Ö?Õ¨, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö? Ö?\nÕ¿Õ¥Õ²Õ¡Õ¤Ö?Õ¥Ö? bridge line-Õ¨ Õ¿Õ¥Ö?Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö?Õ´: Õ?Õ¥Ö?Õ»Õ¸Ö?Õ´, Õ½Õ¥Õ²Õ´Õ¥Ö? Â«Õ?Õ«Õ¡Õ¶Õ¡Õ¬Â», Ö? Ô´Õ¸Ö?Ö? ÕºÕ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ¯Õ¬Õ«Õ¶Õ¥Ö?: ÔµÕ©Õ¥ Õ¹Õ¯Õ¸Õ²Õ´Õ¶Õ¸Ö?Õ¸Õ·Õ¾Õ¥Ö?Õ? Ö?Õ¸Ö?Õ±Õ¥Ö? Õ½Õ¥Õ²Õ´Õ¥Õ¬ Â«Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Â»\nÕ¯Õ¸Õ³Õ¡Õ¯Õ¨ Â«Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Â»-Õ¸Ö?Õ´Õ? Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö?:"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Õ?Õ¸Ö?Ö?Õ¡Õ¤Ö?Õ¸Ö?Õ´ Õ§ Õ¡ÕµÕ½ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨:"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ô´Õ«Õ´Õ¥Õ¬ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ô´Õ«Õ´Õ¥Õ¬ IPv6 bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ô´Õ«Õ´Õ¥Õ¬ Pluggable Transport-Õ« Õ°Õ¡Õ´Õ¡Ö?Õ? Õ¨Õ½Õ¿ TYPE-Õ«: "
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ BridgeDB-Õ« public Gnu-PG key-Õ« ÕºÕ¡Õ¿Õ³Õ¥Õ¶:"
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 61d5dc162..20b3edbf7 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # anzhyo, 2014
 # Astryd Viandila Dahlan, 2015
 # cholif yulian <cholifyulian123@xxxxxxxxx>, 2015
@@ -23,17 +22,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-03-23 06:24+0000\n"
-"Last-Translator: Yerry Borang <yerry.borang@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -45,35 +63,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Laporkan bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kode Sumber"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Perubahan"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontak"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tampilkan QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode untuk bridge Anda"
 
@@ -81,58 +95,58 @@ msgstr "QRCode untuk bridge Anda"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ada masalah!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ada masalah saat mengambil QRCode Anda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QRCode ini berisi jalur bridge Anda. Scan dengan pembaca QRCode untuk menyimpan jalur bridge Anda ke dalam perangkat mobile ataupun perangkat lainnya."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Belum ada bridge yang tersedia..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Langkah %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Unduh %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Langkah %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s bridge %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
@@ -141,27 +155,27 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serikan saya bridge!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Pilihan Lebih Lanjut"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -169,7 +183,7 @@ msgstr "%sY%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sapatkan Jembatan!"
@@ -213,7 +227,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Halo, kawan!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Kunci Publik"
 
@@ -263,7 +277,7 @@ msgid ""
 "\n"
 msgstr "Sebagai tambahan, BridgeDB memiliki banyak jembatan biasa saja %s tanpa\nPluggable Transports %s yang mungkin tidak terdengar keren, tapi dalam banyak kasus\nmereka masih bisa membantu untuk menghindari sensor pada internet.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Apa itu jembatan?"
 
@@ -281,8 +295,8 @@ msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Cara lain untuk mendapatkan Jembatan adalah dengan mengirimkan surel ke %s.\nMohon dicatat bahwa Anda harus mengirim surel menggunakan alamat dari\nsalah satu penyedia layanan surel berikut: %s, %s atau %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -291,54 +305,44 @@ msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Coba sertakan sebanyak mungkin info tentang masalah Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Tor Browser Anda, dan pesan apapun yang diberikan oleh Tor, dll."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Berikut jembatan Anda:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Dapatkan Jembatan!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Mohon pilih opsi untuk tipe jembatan:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Apakah Anda membutuhkan alamat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Apakah Anda membutuhkan %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan karakter dari gambar di atas..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Cara memulai menggunakan jembatan Anda"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +351,21 @@ msgid ""
 msgstr "Untuk memasukkan jembatan ke dalam Tor Browser, pertama kunjungi %s Halaman\nunduhan Tor Browser %s dan kemudian ikuti petunjuk di sana untuk mengunduh dan\nmemulai Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ketika muncul dialog 'Pengaturan Jaringan Tor', klik 'Konfigurasi' dan ikuti\npenuntun sampai ia meminta:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Apakah Penyedia Layanan Internet (ISP) Anda menutup akses atau menyensor\nkoneksi ke jaringan Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -369,28 +373,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Pilih 'Ya' dan kemudian klik 'Lanjut'. Untuk mengkonfigurasi jembatan baru Anda, salin dan\ntempel alamat jembatan ke dalam kotak teks masukan. Akhirnya, klik 'Sambung', dan\nAnda siap menjelajah! Jika Anda mengalami kesulitan, coba klik tombol 'Bantuan'\ndi penuntun 'Pengaturan Jaringan Tor' untuk petunjuk lebih lanjut."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Tampilkan pesan ini"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Minta jembatan yang biasa."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Minta jembatan IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Minta Pluggable Transport berdasarkan TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Dapatkan salinan kunci publik GnuPG BridgeDB."
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index b2d6b6771..12b7a3ad4 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-01-22 09:08+0000\n"
-"Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?bbs! EitthvaÃ° fÃ³r ÃºrskeiÃ°is varÃ°andi beiÃ°nina Ã¾Ãna."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Tilkynna um villu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "GrunnkÃ³Ã°i"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "BreytingaannÃ¡ll"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Hafa samband"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Velja allt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Birta QR-kÃ³Ã°a"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kÃ³Ã°i fyrir brÃºarlÃnurnar Ã¾Ãnar"
 
@@ -67,58 +81,58 @@ msgstr "QR-kÃ³Ã°i fyrir brÃºarlÃnurnar Ã¾Ãnar"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ã?, Ã¦, skrambans!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Villa kom upp Ã¾egar Ã¾Ãº reyndar aÃ° nÃ¡lgast QR-kÃ³Ã°ann Ã¾inn."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ã?essi QR-kÃ³Ã°i inniheldur brÃºarlÃnurnar Ã¾Ãnar. SkannaÃ°u QR-kÃ³Ã°ann meÃ° strikamerkjalesara til aÃ° afrita brÃºarlÃnurnar yfir Ã¡ farsÃma og Ã¶nnur snjalltÃ¦ki."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Engar brÃ½r eru tiltÃ¦kar Ã augnablikinu..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Hugsanlega Ã¦ttirÃ°u aÃ° reyna aÃ° %s fara til baka %s og velja aÃ°ra tegund brÃºar!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Skref %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "SÃ¦kja %s Tor-vafrann %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Skref %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "NÃ¡ Ã %s brÃ½r %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Skref %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃºna Ã¡ aÃ° %s bÃ¦ta brÃºnum viÃ° Tor-vafrann %s"
@@ -127,27 +141,27 @@ msgstr "NÃºna Ã¡ aÃ° %s bÃ¦ta brÃºnum viÃ° Tor-vafrann %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%sefÃ°u mÃ©r bara brÃ½rnar!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "NÃ¡nari stillingar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ekkert"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÃ¡!"
@@ -155,7 +169,7 @@ msgstr "%sJ%sÃ¡!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sÃ¡ Ã brÃ½r"
@@ -199,7 +213,7 @@ msgstr "HÃ¦, %s!"
 msgid "Hello, friend!"
 msgstr "SÃ¦ll vinur!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Dreifilyklar"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr "AÃ° auki er BridgeDB meÃ° fullt af Ã³skÃ¶p venjulegum brÃºm %s sem ekki nota\nPluggable Transports %s, sem gÃ¦ti hljÃ³maÃ° aÃ°eins minna svalt, en getur samt\nhjÃ¡lpaÃ° til Ã mÃ¶rgum tilfellum til aÃ° komast framhjÃ¡ ritskoÃ°un.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "HvaÃ° eru brÃ½r?"
 
@@ -267,8 +281,8 @@ msgstr "Ã?g Ã¾arf einhverja aÃ°ra leiÃ° til aÃ° nÃ¡ Ã brÃ½r!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ã?nnur leiÃ° til aÃ° nÃ¡ Ã brÃ½r er aÃ° senda tÃ¶lvupÃ³st til %s. AthugaÃ°u aÃ° Ã¾Ãº verÃ°ur\naÃ° senda tÃ¶lvupÃ³stinn meÃ° netfangi frÃ¡ einhverjum aÃ° eftirtÃ¶ldum pÃ³stÃ¾jÃ³nustum:\n%s, %s eÃ°a %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "BrÃ½rnar mÃnar virka ekki! Ã?g Ã¾arf hjÃ¡lp!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ef Tor virkar ekki, Ã¦ttirÃ°u aÃ° senda tÃ¶lvupÃ³st Ã¡ %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Reyndu aÃ° hafa meÃ° eins miklar upplÃ½singar um aÃ°stÃ¦Ã°ur Ã¾Ãnar eins og hÃ¦gt er,\nÃ¾ar meÃ° taliÃ° allar Ã¾Ã¦r brÃ½r og Pluggable Transport tengileiÃ°ir Ã¾Ãº reyndir aÃ° nota,\nÃºtgÃ¡fu Tor-vafrans, auk allra skilaboÃ°a sem komu frÃ¡ Tor, o.s.frv.."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "HÃ©r eru brÃºarlÃnurnar Ã¾Ãnar:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "SÃ¦kja brÃ½r!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Veldu valkosti fyrir tegund brÃºar:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ã?arftu IPv6-vistfÃ¶ng?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ã?arftu %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Vafrinn Ã¾inn birtir myndir ekki rÃ©tt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Settu inn stafina Ãºr myndinni hÃ©r aÃ° ofan..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "LeiÃ°ir til aÃ° byrja aÃ° nota brÃ½rnar Ã¾Ãnar"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr "Til aÃ° setja brÃ½r inn Ã Tor-vafrann, farÃ°u fyrst Ã¡ %s niÃ°urhalssÃÃ°u Tor-vafrans %s\nog farÃ°u eftir leiÃ°beiningum um hvernig eigi aÃ° sÃ¦kja og gangsetja hann."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ã?egar glugginn 'Netkerfisstillingar Tor' birtist, smelltu Ã¡ 'Stilla' og fylgdu sÃÃ°an\nleiÃ°arvÃsinum Ã¾ar til hann spyr:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Hindrar eÃ°a ritskoÃ°ar netÃ¾jÃ³nustuaÃ°ilinn Ã¾inn (ISP) Ã¡ einhvern hÃ¡tt tengingar\ninn Ã¡ Tor-netiÃ°?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Veldu 'JÃ¡' og smelltu sÃÃ°an Ã¡ 'NÃ¦sta'. Til aÃ° setja upp nÃ½ju brÃ½rnar Ã¾Ãnar, afritaÃ°u\nog lÃmdu brÃºarlÃnurnar inn Ã textareitinn. AÃ° lokum smellirÃ°u Ã¡ 'Tengjast', og Ã¾Ã¡\nÃ¦tti allt aÃ° vera tilbÃºiÃ°! Ef Ã¾Ãº lendir Ã vandrÃ¦Ã°um, geturÃ°u prÃ³faÃ° aÃ° smella Ã¡\n'HjÃ¡lp'-hnappinn Ã 'Netstillingar Tor'-leiÃ°arvÃsinum."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Birtir Ã¾essi skilaboÃ°."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "BiÃ°ja um venjulegar brÃ½r."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "BiÃ°ja um IPv6-brÃ½r."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "BiÃ°ja um Pluggable Transport tengileiÃ° eftir TYPE tegundum."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "NÃ¡ Ã afrit af GnuPG-dreifilykli frÃ¡ BridgeDB"
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index f7e7265e5..909d4811e 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Alberto <alberto.pilato@xxxxxxxxx>, 2015
 # Alessandro Toffalini, 2017
 # DarkGreninja <leonardo.pantani@xxxxxxxxx>, 2017
@@ -27,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-06-05 09:40+0000\n"
-"Last-Translator: Gio Doro <CyberMatique@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Siamo spiacenti ma qualcosa Ã¨ andato storto con la tua richiesta."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Segnala un Problema"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Codice sorgente"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "NovitÃ "
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contatti"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostra Codice QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Codice QR per le tue bridge lines"
 
@@ -85,58 +99,58 @@ msgstr "Codice QR per le tue bridge lines"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Figo!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Sembra che ci sia stato un errore nell'ottenere il tuo QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore QR per copiare le tue linee ponte sul telefono cellulare o su altri dispositivi."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Non ci sono bridge disponibili al momento..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Scarica %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ottenere dei %s bridge %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
@@ -145,27 +159,27 @@ msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sammi i bridge e basta!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opzioni Avanzate"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "nessuno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ¬!"
@@ -173,7 +187,7 @@ msgstr "%sS%sÃ¬!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sttieni Bridge"
@@ -217,7 +231,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Ciao amico!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
@@ -267,7 +281,7 @@ msgid ""
 "\n"
 msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Cosa sono i bridge?"
 
@@ -285,8 +299,8 @@ msgstr "Mi serve un altro modo per avere dei bridge!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Un altro modo di ottenere i bridge Ã¨ inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s."
+"%s or %s."
+msgstr "Un altro modo per ottenere dei bridge Ã¨ inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "I miei bridge non funzionano! Mi serve aiuto!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor non ti funziona, manda un'email a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Cerca di includere piÃ¹ informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ecco le tue linee bridge:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ottieni dei Bridge!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Seleziona le opzioni per il tipo di bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ti servono indirizzi IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ti serve un %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Il tuo browser non mostra le immagini in modo corretto."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Inserisci i caratteri nell'immagine sopra..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Come iniziare a usare i tuoi bridge"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,21 @@ msgid ""
 msgstr "Per inserire i bridge in Tor Browser, prima vai nella %s pagina di download di\nTor Browser %s e poi segui lÃ¬ le istruzioni per scaricare ed avviare Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchÃ¨ non chiede:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -373,28 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Seleziona 'SÃ¬' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Mostra questo messaggio."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Richiedi bridge vanilla."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Richiedi bridge IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Richiedi un Pluggable Transport by TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index 3b07e6470..33b5e20d8 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # 323484, 2018
 # brt <87@xxxxxxxxxxx>, 2013
 # ABE Tsunehiko, 2014-2015
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "ã??ã?°ã??å ±å??ã??ã??"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "å¤?æ?´å±¥æ´"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ã??å??ã??å??ã??ã??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ã??ã?¹ã?¦é?¸æ??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR ã?³ã?¼ã??ã??è¡¨ç¤º"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?® QR ã?³ã?¼ã??"
 
@@ -74,58 +88,58 @@ msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?® QR ã?³ã?¼ã??"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "ã??ã?£ã?¨ã?¹ã??ã?²ã??ã??ã?£ï¼?"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR ã?³ã?¼ã??ã??ä½?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "ã??ã?® QR ã?³ã?¼ã??ã?¯ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??å?«ã?¿ã?¾ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "ã??ã??ã??ã?? ã?? %s æ?»ã?£ã?¦ %s ç?°ã?ªã??ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã?¿ã??ã?¹ã??ã?§ã??ã??ã??ã??"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "ã?¹ã??ã??ã?? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "ã?¹ã??ã??ã?? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "ã?¹ã??ã??ã?? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
@@ -134,27 +148,27 @@ msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "é«?åº¦ã?ªè¨å®?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ã?ªã??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sã?¯%sã??ï¼?"
@@ -162,7 +176,7 @@ msgstr "%sã?¯%sã??ï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
@@ -206,7 +220,7 @@ msgstr "ã?©ã??ã?? %s ã??ã??ï¼?"
 msgid "Hello, friend!"
 msgstr "ã?©ã??ã??ã??ã??ã??ã?«ã?¡ã?¯ï¼?"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬é??é?µ"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "å? ã??ã?¦ã??  BridgeDB ã?¯ã?? %s Pluggable Transport %s ã?®ã?ªã??å¤?ã??ã?®ä½?ã?®å¤?å?²ã??ã?ªã??\né??å¸¸ã?®ã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã?¯ã?¼ã?«ã?«ã?¯æ??ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã??ã??å¤?ã??ã?®å ´å??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
 
@@ -274,8 +288,8 @@ msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®ã??ã??æ?¹ã?¯ %s ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??\nä»¥ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??:\n %s ã?? %s ã?¾ã??ã?¯ %s"
+"%s or %s."
+msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®ã??ã??æ?¹ã?¯ %s ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??ä»¥ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??: %s ã?¾ã??ã?¯ %s"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??ã??"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ã??ã?ªã??ã??ä½¿ã??ã??ã?¨ã??ã??ã??ã?ªã??ã?¸ã?? Pluggable Transports ã?? ã??å?©ç?¨ã?® Tor Browser ã??ã?¼ã?¸ã?§ã?³ã??ã??ã??ã?¦ Tor ã??å?ºå??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ç?ã?ªã?©ã??å?«ã?¿ã??å?ºæ?¥ã??é??ã??ã??ã?ªã??ã?®ã?±ã?¼ã?¹ã?«é?¢ã??ã??å¤?ã??ã?®æ??å ±ã??å?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?¯ã??ã?¡ã??ã?§ã??:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??è¡¨ç¤ºã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??è¦§ã??ã? ã??ã??ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¤ã?¢ã?ã?°ã??ã??ã??ã??ã?¢ã??ã??ã??ã??é??ã??è¨å®?ã??ã?¯ã?ªã??ã?¯ã??ã?¦\nè??ã??ã??ã??ã?¾ã?§ã?¦ã?£ã?¶ã?¼ã??ã?«å¾?ã?£ã?¦ã??ã? ã??ã??ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ã??å?©ç?¨ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã?ªã??ã??\nå?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã??ã??ã?«ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??\nã??ã??æº?å??ã??å?ºæ?¥ã??ã?¯ã??ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«\nã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "ã??ã?®ç?»å??ã??è¡¨ç¤º"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "vanilla ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ã?¿ã?¤ã??ã??ã?¨ã?« Pluggable Transport ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB ã?® GnuPG å?¬é??é?µã?®ã?³ã??ã?¼ã??æ??ã?«å?¥ã??ã?¾ã??ã??ã??ã??"
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index e5a385f20..a7c0e9485 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Georgianization, 2018
 # George Rommel <x0rmia@xxxxxxxxx>, 2013
 # Shanidze <sandro.shanidze@xxxxxxxxx>, 2015
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ka\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á?? á? á??á?¦á??á?ª á??á??á? á??á??."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "á?®á??á? á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "á??á??á? á??á??á??á?¬á?§á??á? á?? á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "á?ªá??á??á??á??á??á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "á??á??á??á?¨á??á? á??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "á?§á??á??á??á??á?¡ á??á??á??á??á?¨á??á??á??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR-á??á??á??á??á?¡ á?©á??á??á??á??á??á??"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á?¡á??á??á??á?¡"
 
@@ -69,58 +83,58 @@ msgstr "QR-á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¡á??á??á??á? á??
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "á?£á?°, á? á??á?¦á??á?ª á? á??á??á??á?? á??á??á? á??á??!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "á? á??á??á??á? á?ª á?©á??á??á?¡, á? á??á?¦á??á?ª á?¨á??á?ªá??á??á??á?? á?¬á??á? á??á??á??á?¨á??á?? QR-á??á??á??á??á?¡ á??á??á?¦á??á??á??á?¡á??á?¡."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR-á??á??á??á?? á?¨á??á??á?ªá??á??á?¡ á??á?¥á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¡á??á??á??á? á??á?¡. á??á??á??á??á??á?¢á??á? á??á?? QR-á??á??á??á??á?¡ á?¬á??á??á??á??á??á?®á??á??á?? á??á??á?¡á??á??á??á? á??á??á?¡ á??á?¡á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á?? á?¢á??á??á??á?¤á??á??á?¡á?? á??á?? á?¡á?®á??á?? á??á??á?¬á?§á??á??á??á??á??á??á??á??á??á??."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "á??á??á??á??á??á??á?? á??á? á?ªá??á? á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á?? á??á? á??á?? á?®á??á??á??á??á?¡á??á?¬á??á??á??á??á??..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "á?¡á??á??á??á? á??á?£á??á??á??, á?¡á?¯á??á??á?¡ á?¡á?ªá??á??á??á?? %s á??á??á??á? á?£á??á??á??á?? %s á??á?? á??á??á? á?©á??á??á?? á?¡á?®á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "á??á??á??á??á?¯á?? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? %s Tor-á??á? á??á?£á??á??á? á?? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "á??á??á??á??á?¯á?? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "á??á??á??á?¦á??á?? %s á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "á??á??á??á??á?¯á?? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %s"
@@ -129,27 +143,27 @@ msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sá?£%sá??á? á??á??á??á?? á??á??á??á??á?ªá??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "á??á??á??á??á?¢á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "á??á? á??"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "á??á? á?ªá??á? á??á??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sá??%sá??á??á?®!"
@@ -157,7 +171,7 @@ msgstr "%sá??%sá??á??á?®!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sá??%sá??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á??á??á?? (Bridges)"
@@ -201,7 +215,7 @@ msgstr "á??á??á??á??á? á?¯á??á??á??, %s!"
 msgid "Hello, friend!"
 msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á??, á??á??á??á??á??á??á? á??!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "á?¡á??á?¯á??á? á?? á??á??á?¡á??á?¦á??á??á??á??á??"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "á??á??á??á?¡á??á??á??, BridgeDB-á?¡ á??á??á??á?©á??á??á?? á?£á??á??á? á??á??á?? á?©á??á??á?£á??á??á??á? á??á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?ª %sá?§á??á??á??á??á??á??á??á? á??\ná??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á?¡ (Pluggable Transports) á??á??á? á??á?¨á??, %s á? á??á?ª á??á? á?ª á??á?¡á?? á?¨á??á??á??á??á??á?á??á??á??á??á?? á??á??á??á??á??á??á?¥á??á??á?¡, á??á?£á??á?ªá?? á??á??á??á??á?ª á??á??á??á??á?¡á??á??á??á??á??á??\ná??á??á?¢á??á? á??á??á?¢á??á?¡ á?¨á??á??á?¦á?£á??á??á??á??á??á?¡á??á??á??á?¡ á??á??á??á??á?¡ á??á?¡á??á? á??á??á??á??á??á??á?? á??á? á??á??á? á?? á?¨á??á??á??á?®á??á??á??á??á?¨á??.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "á? á??á?¡ á?¬á??á? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á???"
 
@@ -269,8 +283,8 @@ msgstr "á?¡á?®á??á?? á??á??á??á??á?? á??á??á?¡á??á?á??á? á??á??á??á?? á??á??á??
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "á??á??á??á??á?? á??á? á??á?? á?¡á??á?¨á?£á??á??á??á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??, á? á??á?? á??á??á??á??á??á??á??á??á?? á??á??á?¤á??á?¡á?¢á?? á??á??á?¡á??á??á??á? á??á??á?? %s. á??á??á?®á??á??á?? á??á??á??á??á??á??á??á??á?¡á?¬á??á??á??á??, á? á??á?? á?¬á??á? á??á??á?? á??á??á??á??á??á??á??á??á??á??á??á?? á?£á??á??á?? á??á?§á??á?¡ á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á? á??á??á??á??á??á??á?? á??á?? á??á??á??á?¬á??á??á??á??á??á??á?¡ á?¤á??á?¡á?¢á??á??á??á??:\n%s, %s á??á?? %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "á?©á??á??á?? á?®á??á??á??á??á?? á??á?  á??á?£á?¨á??á??á??á?¡! á??á??á?®
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á?£ á??á?¥á??á??á??á?? Tor á??á?  á??á?£á?¨á??á??á??á?¡, á??á??á??á??á??á??á??á??á??á??á?? á??á??á?¤á??á?¡á?¢á?? %s á??á??á?¡á??á??á??á? á??á??á??."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "á?¨á??á??á?ªá??á??á??á?? á??á??á?¢á??á?? á??á? á?ªá??á??á?? á??á?¦á?¬á??á? á??á?? á??á?¥á??á??á??á?? á?¨á??á??á??á?®á??á??á??á?? á??á?? á??á??á?£á? á??á??á?? á?¡á??á?? á??á??\ná??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡á?? á??á?? á??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á??á??á?¡ (Pluggable Transports) \ná? á??á??á??á??á?¡ á??á??á??á??á?§á??á??á??á??á??á?ª á?¡á?ªá??á??á??á??, á??á??á??á?¡á??á??á?? á??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á? á?¡á??á??, á?§á??á??á??á?? á?¨á??á?¢á?§á??á??á??á??á??á??á??, á? á??á?ª Tor-á??á?? á??á??á?©á??á??á??á??á?? á??á?? á??.á?¨."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "á??á?¥ á??á? á??á?¡ á??á?¥á??á??á??á?? á?¡á??á?®á??á??á?? á?®á??á??á??á??á??:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "á??á??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "á??á??á?®á??á??á??, á??á??á?£á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? IPv6-á??á??á?¡á??á??á??á? á??á??á??á???"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "á??á?¥á??á??á??á?? á??á? á??á?£á??á??á? á?? á??á?  á??á?©á??á??á??á??á??á?¡ á?¡á?£á? á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "á?¨á??á??á?§á??á??á??á??á?? á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á?? á??á? á?¡á??á??á?£á??á?? á?¡á?£á? á??á??á??á??á??á??..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "á? á??á??á??á?  á?£á??á??á?? á??á??á??á??á??á??á?§á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á?¨á??á?¡á??á?§á??á??á??á??á??, á??á??á??á??á??á??á??á? á??á??á??á??á?? á??á??á??á??á??á??á?? %sTor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡\ná??á??á??á? á??á??á?? %s á??á?? á?¨á??á??á??á??á?? á??á??á?§á??á??á??á?? á??á?¥ á??á??á?ªá??á??á?£á?? á??á??á??á??á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡á?? á??á??\ná??á??á?¨á??á??á??á??á?¡ á??á??á??á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "á? á??á??á??á?¡á??á?ª â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á?¤á??á??á?¯á??á? á?? á??á??á??á??á?©á??á??á??á??á??, á??á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á? á??á??á??á?¡â?? á??á?? á??á??á?°á?§á??á??á??á??\ná??á??á??á??á?£á? á?¡ á?¨á??á??á??á??á?? á?¨á??á??á??á??á?®á??á??á??á??á??:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "á??á?¥á??á??á??á?? á??á??á?¢á??á? á??á??á?¢-á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á??á??á??á?¬á??á??á??á??á??á??á?? (ISP) á??á? á?«á??á??á??á??á?¡ á??á?? á? á??á??á??á??á??á??á? á??á??\ná??á?¦á?£á??á??á??á?¡ Tor-á?¥á?¡á??á??á??á??á?? á??á??á??á?¨á??á? á?¡?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "á??á??á?£á??á??á??á??á?? â??á??á??á??á?®â?? á??á?? á?¨á??á??á??á??á?? á??á??á?¬á??á??á??á??á?? â??á?¨á??á??á??á??á??â??. á??á?¥á??á??á??á?? á??á?®á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??, á??á??á?¦á??á?? á??á?¡á??á?? á??á??\ná?©á??á?¡á??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á?? á?¢á??á?¥á?¡á?¢á??á?¡ á?¨á??á?¡á??á?§á??á??á?? á??á??á??á?¨á??. á??á??á??á??á?¡ á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á??á?¨á??á? á??á??á??â?? á??á??\ná?¬á??á?¡á??á?? á?§á??á??á??á??á?¤á??á? á?? á??á??á?£á?¨á??á??á??á??á?¡! á??á?£ á? á??á??á?? á??á??á??á? á??á??á??á??á??á??á?¡ á??á??á??á??á??á?¬á?§á??á??á??á??á??, á?¡á?ªá??á??á??á?? â??á??á??á?®á??á??á? á??á??á??á?¡â?? á?¦á??á??á??á??á??á??\ná??á??á?¬á??á??á??á??á??á?? â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á??á??á??á??á?£á? á?¨á??, á??á??á??á??á?¢á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á?¡ á??á??á?¡á??á?¦á??á??á??á??."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "á??á?? á?¨á??á?¢á?§á??á??á??á??á??á??á??á?¡ á?©á??á??á??á??á??á??."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "á?©á??á??á?£á??á??á??á? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6-á??á??á?¡á??á??á??á? á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "á??á??á?¡á??á??á? á??á??á??á??á??á?? TYPE-á??á??á??á??á??á?§á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB-á?¡ á?¡á??á??á?¯á??á? á?? GnuPG-á??á??á?¡á??á?¦á??á??á??á?¡ á??á??á?¦á??á??á??."
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index d5c2548da..7cef6a792 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>, 2019
 # Gabit Aidarbek <agabit@xxxxxxxxx>, 2014
 # Nurlan Rakhimzhanov <nurlan.rakhimzhanov@xxxxxxxxx>, 2014
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-20 18:32+0000\n"
-"Last-Translator: Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?ÐµÑ?Ñ?Ñ?Ñ?Ò£Ñ?Ð·, Ñ?Ñ?Ð·Ð´Ñ?Ò£ Ñ?Ò±Ñ?Ð°Ð½Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±ÐµÐ»Ð³Ñ?Ñ?Ñ?Ð· Ò?Ð¸Ñ?Ð½Ñ?Ñ?Ð»Ñ?Ò?Ñ?Ð°Ñ? Ð±Ð°Ñ?. "
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ò?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ð»Ñ? Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¿Ò?Ñ? ÐºÐ¾Ð´Ñ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ó¨Ð·Ð³ÐµÑ?Ñ?Ñ?Ñ?ÐµÑ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð·"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR ÐºÐ¾Ð´Ñ?Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð· Ò¯Ñ?Ñ?Ð½ QR ÐºÐ¾Ð´Ñ?"
 
@@ -69,58 +83,58 @@ msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð· Ò¯Ñ?Ñ?Ð½ QR ÐºÐ¾Ð´
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð£Ñ?Ñ?,Ñ?Ð¿Ð°Ð³ÐµÑ?Ñ?Ð¸!\nÐ?Ð°Ñ?Ð³Ð¾Ð½ Ñ?Ó©Ð·."
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ QR ÐºÐ¾Ð´Ñ?Ñ? Ð°Ð»Ò?Ð°Ð½ ÐºÐµÐ·Ð´Ðµ Ò?Ð°Ñ?ÐµÐ»Ñ?Ðº Ð±Ð¾Ð»Ò?Ð°Ð½ Ñ?Ð¸Ñ?Ò?Ñ?Ñ?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ò±Ð» QRCode Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ð½ Ò?Ð°Ð¼Ñ?Ð¸Ð´Ñ?. Ð?Ó©Ñ?Ñ?Ñ?Ð¼Ðµ Ð¶Ð¾Ð»Ð´Ð°Ñ?Ð´Ñ? Ò±Ñ?Ð»Ñ? Ð¶Ó?Ð½Ðµ Ð±Ð°Ñ?Ò?Ð° Ò?Ò±Ñ?Ñ?Ð»Ò?Ñ?Ð»Ð°Ñ?Ò?Ð° ÐºÓ©Ñ?Ñ?Ñ?Ñ? Ò¯Ñ?Ñ?Ð½ Ð¾Ð½Ñ? QRCode Ð¾Ò?Ñ?Ñ?Ð¼Ð°Ð½Ñ?Ð¼ÐµÐ½ Ñ?ÐºÐ°Ð½ÐµÑ?Ð»ÐµÒ£Ñ?Ð·."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð½Ð´Ð° Ò?Ð°Ð·Ñ?Ñ?Ð³Ñ? ÐºÐµÐ·Ð´Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶Ð¾Ò? ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ò¯Ð¼ÐºÑ?Ð½ Ñ?Ñ?Ð· %sÒ?Ð°Ð¹Ñ?Ð°Ð´Ð°Ð½ Ð±Ð°Ñ?Ñ?Ò?Ð° %sÐ¶Ó?Ð½Ðµ Ð±Ð°Ñ?Ò?Ð° ÐºÓ©Ð¿Ñ?Ñ? Ñ?Ò¯Ñ?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ñ?Ò?Ð° Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð· ÐºÐµÑ?ÐµÐº!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser %s Ð¶Ò¯ÐºÑ?ÐµÑ?"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? %s Ð°Ð»Ñ?"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð?Ð½Ð´Ñ? %s Tor Brouser-Ð³Ðµ  ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ñ? %s"
@@ -129,27 +143,27 @@ msgstr "Ð?Ð½Ð´Ñ? %s Tor Brouser-Ð³Ðµ  ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ñ? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¼Ð°Ò?Ð°Ð½ Ð±ÐµÑ?Ñ?Ò£Ñ?Ð·! "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð¢Ð¾Ð»Ñ?Ò? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ð¾Ò?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð?Ð¾Ò?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses! "
@@ -157,7 +171,7 @@ msgstr "%sY%ses! "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Ð?Ó©Ð¿Ñ?Ñ? "
@@ -201,7 +215,7 @@ msgstr "Ó?Ð¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð¡Ó?Ð»ÐµÐ¼, Ð´Ð¾Ñ?Ñ?Ð¼!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ñ?Ò? ÐºÑ?Ð»Ñ?Ñ?ÐµÑ?"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "Ð¡Ð¾Ð½Ñ?Ð¼ÐµÐ½ Ò?Ð°Ñ?Ð°Ñ?, BridgeDB-Ð´Ðµ ÐºÓ©Ð¿Ñ?ÐµÐ³ÐµÐ½ plain-ol'-vanilla ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?%s  Pluggable Transports %sÐ¾Ð»Ð°Ñ? Ð¼Ò¯Ð¼ÐºÑ?Ð½ ÐºÒ¯Ñ?Ñ?Ñ? ÐµÐ¼ÐµÑ?, Ð±Ñ?Ñ?Ð°Ò? Ð¾Ð»Ð°Ñ? \nÐºÓ©Ð¿Ñ?ÐµÐ³ÐµÐ½ Ð¶Ð°Ò?Ð´Ð°Ð¹Ð»Ð°Ñ?Ð´Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ð½Ñ? Ð°Ð¹Ð½Ð°Ð»Ñ?Ð¿ Ó©Ñ?Ñ?Ð³Ðµ ÐºÓ©Ð¼ÐµÐºÑ?ÐµÑ?ÐµÐ´Ñ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð´ÐµÐ³ÐµÐ½Ñ?Ð¼Ñ?Ð· Ð½Ðµ?"
 
@@ -269,8 +283,8 @@ msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ð¼Ð°Ò?Ð°Ð½ Ð±Ð°Ñ?Ò?Ð° Ð¶Ð¾Ð»Ñ? ÐºÐµÑ?ÐµÐº!
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ñ?Ð°Ò?Ñ? Ð±Ñ?Ñ? Ð¶Ð¾Ð»Ñ? - Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ò?Ð° Ð¶Ñ?Ð±ÐµÑ?Ñ?%s.Ð?Ð°Ð·Ð°Ñ? Ð°Ñ?Ð´Ð°Ñ?Ñ?Ò£Ñ?Ð·, Ñ?Ñ?Ð·Ð³Ðµ ÐºÐµÑ?ÐµÐº\nÑ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ? Ñ?Ó©Ð¼ÐµÐ½Ð´ÐµÐ³Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð´Ñ?Ò? Ð¿Ð¾Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ð»ÐµÑ?Ñ?Ð½Ñ?Ò£ Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ò£ Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ?Ð½Ð°Ð½ Ð¶Ñ?Ð±ÐµÑ?Ñ?Ò£Ñ?Ð·:%s,%s Ð½ÐµÐ¼ÐµÑ?Ðµ%s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Ð?ÐµÐ½Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð¼ Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¼ÐµÐ¹Ð´Ñ?! Ð?Ó©Ð¼Ðµ
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ñ?Ò£ Tor Ð¶ÐµÐ»Ñ?Ò£Ñ?Ð· Ñ?Ñ?Ñ?ÐµÐ¼ÐµÑ?Ðµ,Ð¼Ñ?Ð½Ð° email-Ò?Ð° Ð¶Ð°Ð·Ñ?Ò£Ñ?Ð· %s. "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ó¨Ð·Ñ?Ò£Ñ?Ð·Ð´Ñ?Ò£ Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ñ?Ñ?Ñ?Ð°Ð»Ñ?, Ñ?Ð¾Ð½Ñ?Ò£ Ñ?Ñ?Ñ?Ð½Ð´Ðµ, Ñ?Ñ?Ð·Ñ?Ð¼Ñ?Ð½ Ò?Ð¾Ñ?Ñ?Ð¿ ÐºÓ©Ñ?Ñ?Ò£Ñ?Ð·\nÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¶Ó?Ð½Ðµ Pluggable Transports-Ñ?Ñ? Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ò?Ñ?Ò£Ñ?Ð· ÐºÐµÐ»Ð³ÐµÐ½, Tor Browser Ð½Ò±Ñ?Ò?Ð°Ñ?Ñ?Ð½,\nÐ¶Ó?Ð½Ðµ Tor Ð±ÐµÑ?Ð³ÐµÐ½ Ð±Ð°Ñ?Ð»Ñ?Ò? Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ? Ð¶Ó?Ð½Ðµ Ñ?.Ð±."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ðµ Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ò£Ñ?Ð·!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ? Ñ?Ò¯Ñ?Ñ?Ð½Ñ?Ò£ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¡Ñ?Ð·Ð³Ðµ IPv6 Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ð»Ð°Ñ?Ñ? ÐºÐµÑ?ÐµÐº Ð¿Ðµ?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s Ñ?Ñ?Ð·Ð³Ðµ Ò?Ð°Ð¶ÐµÑ?Ð¿Ðµ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ?Ò£Ñ?Ð· Ð´Ò±Ñ?Ñ?Ñ? Ð±ÐµÐ¹Ð½ÐµÐ½Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ð¿ÐµÐ¹Ð´Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð¾Ò?Ð°Ñ?Ñ?Ð´Ð°Ò?Ñ? Ñ?Ñ?Ñ?ÐµÑ?Ñ?ÐµÐ³Ñ? Ñ?Ð°Ò£Ð±Ð°Ð»Ð°Ñ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ?Ò£Ñ?Ð· ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·Ð´Ñ? Ò?Ð°Ð»Ð°Ð¹ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ò?Ð° Ð±Ð¾Ð»Ð°Ð´Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "Tor Browser-Ð³Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ? Ò¯Ñ?Ñ?Ð½, Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ñ? Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ %sTor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·\n %sÐ¶Ó?Ð½Ðµ Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ Ð½Ò±Ñ?Ò?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ñ? Ð¾Ò?Ñ?Ð¿ Tor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ Ð?Ð?Ð¡Ð¢Ð?Ò¢Ð«Ð?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "'Tor Network Settings' Ð´Ð¸Ð°Ð»Ð¾Ð³Ñ? Ñ?Ñ?Ò?Ò?Ð°Ð½ ÐºÐµÐ·Ð´Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?' Ð¿Ó?Ñ?Ð¼ÐµÐ½Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ð¿, Ð¾Ð½Ñ? Ð¾Ñ?Ñ?Ð½Ð´Ð°Ò£Ñ?Ð·\nÑ?ÐµÐ±ÐµÑ? Ñ?Ò±Ñ?Ð°Ò?Ð°Ð½Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?ÐµÐ³Ñ? Ò?Ñ?Ð·Ð¼ÐµÑ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ñ?  Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ñ?Ò£Ñ?Ð·(ISP) Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ò?Ð° Ð±Ð°Ð¹Ð»Ð°Ð½Ñ?Ñ?Ñ?Ñ? \"Tor\" Ð¶ÐµÐ»Ñ?Ñ?Ñ?Ð½ Ð±Ò±Ò?Ð°Ñ?Ñ?Ð°Ð¹Ð¼Ð°?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Ð?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ñ?Ð°Ò£Ð´Ð°Ð¿, 'Ð?ÐµÐ»ÐµÑ?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·. Ð?Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð»Ð°Ñ?, ÐºÓ©Ñ?Ñ?Ñ?Ñ? Ð¶Ó?Ð½Ðµ\nÐºÓ©Ð¿Ñ?Ñ? Ð¶Ð¾Ð»Ð´Ð°Ñ?Ñ?Ð½ Ð¼Ó?Ñ?Ñ?Ð½ ÐµÐ½Ð³Ñ?Ð·Ñ? Ð¶Ð¾Ð»Ð°Ò?Ñ?Ð½Ð° Ò?Ð¾Ð¹Ñ?Ò£Ñ?Ð·. Ð¡Ð¾Ò£Ñ?Ð½Ð´Ð°, Â«Ò?Ð¾Ñ?Ñ?Ð»Ñ?Â» Ñ?Ò¯Ð¹Ð¼ÐµÑ?Ñ?Ð³Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·.\nÐ?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ðµ Ò?Ð¸Ñ?Ð½Ð´Ñ?Ò?Ñ?Ð°Ñ? Ñ?Ñ?Ñ?Ð½Ð´Ð°Ñ?Ð°, Â«Ð?Ð½Ñ?Ò?Ñ?Ð°Ð¼Ð°Â» Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ\nÒ?Ð¾Ñ?Ñ?Ð¼Ñ?Ð° ÐºÓ©Ð¼ÐµÐº Ð°Ð»Ñ? Ò¯Ñ?Ñ?Ð½ Â«Tor Network SettingsÂ» Ð±Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ò±Ð» Ñ?Ð°Ð±Ð°Ñ?Ð´Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?ÐµÐ´Ñ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð½Ð¸Ð»Ñ?Ð´Ñ? ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ñ?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ò±Ñ?Ð°Ñ?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ð»Ð³ÐµÐ½ Ñ?Ð°Ñ?Ñ?Ð¼Ð°Ð»Ð´Ñ? Ñ?Ò±Ñ?Ð°Ò£Ñ?Ð·."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB Ò?Ð¾Ò?Ð°Ð¼Ð´Ñ?Ò? GnuPG ÐºÑ?Ð»Ñ?Ñ?Ð½Ñ?Ò£ ÐºÓ©Ñ?Ñ?Ñ?Ð¼ÐµÑ?Ñ?Ð½ Ð°Ð»Ñ?Ò£Ñ?Ð·."
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 1fd1db148..5dab45671 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Dany Sum <danysum696@xxxxxxxxx>, 2018
 # Seng Sutha <sutha@xxxxxxxxxxx>, 2014
 # Sokhem Khoem <sokhem@xxxxxxxxxxx>, 2014
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-09-23 05:02+0000\n"
-"Last-Translator: Dany Sum <danysum696@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»á??â??á??á?¶á??á?½á??â??á??á??á??á?¾â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "á??á?¼á??â??á??á??á??á??á??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "á??á??á??á?¶á??á??á??á??á??á??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "á??á??á??á?¾á??á??á?¾á??á??á?¶á??á??á?¢á??á??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "á??á??á??á? á?¶á?? QRá??á?¼á??"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr ""
 
@@ -71,58 +85,58 @@ msgstr ""
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " á??á??á??á? á??á??â??á??á?¶â??á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¶á??á?¶á?? %s á??á??á??á?¡á??á??â??á??á??â??á??á?¶á??á?? %s á? á?¾á??â??á??á??á??á?¾á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??á??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "á??á??á? á?¶á?? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "á??á??á? á?¶á?? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "á??á??á? á?¶á?? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "á??á??"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "á??á??á??á?¶á??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -159,7 +173,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
@@ -203,7 +217,7 @@ msgstr "á? á??, %s!"
 msgid "Hello, friend!"
 msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "á??á?¾â??á??á??á??á??á?¸á??á??á??â??â??á??á?¶â??á?¢á??á??á?¸?"
 
@@ -271,8 +285,8 @@ msgstr "á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á?·á??á?¸á??á?¶á??á??á??
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "á??á?·á??á?¸á??á?½á??â??á??á??á??â??á??á?¾á??á??á??á?¸á??á??á?½á?? bridges á??á?ºâ??á??á??á??á?¼á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á?? %s á?? á??á?¼á??â??á??á??á??á?¶á??â??á??á?¶ á?¢á??á??á??á??á??á??á?¼á??â??á??á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á??á??â??á??á??á??á?¾á?¢á?¶á??á??á??á??á??á?¶á??â??á??á?¸â??á??á??á??á?»á??á? á??á?»á??â??á??á??á??á??á??á?¢á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?»á??â??á??á??á??á??á??â??á??á??á??á?»á??á? á??á?»á??â??á??á?¶á??â??á??á??á??á??á??á??\n%s, %s á?¬ %s á??"
+"%s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "á??á??á??á??á?¸á??á??á??â??â??á??á??á??á??â??á??á??á??á?»á??â??á??á?·á??
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á??á??á??á?·á??á??á?¾ Tor á??á??á??á??â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??, á?¢á??á??á??â??á??á?½á??á??á??â??á?¢á??á?¸á??á??á?? %s á??"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "á??á??á??â??á??á?¶â??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "á??á??á?½á??â??á??á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "á??á??â??á??á??á??â??á??á??á??á?¢á??á??â?? 'á??á?¶á??â??á??á??á??á??á??â??á??á??á??á??á?¶á??' á??á??á??â??á?¡á?¾á??, á??á?»á?? 'á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??' á??á?·á??â??á?¢á??á?»á??á??á??á??â??á?¢á??á??á??â??á??á??á??á?½á??á??á?¶á??â??á??á? á?¼á??â??á??á??á??â??á??á?¶á??á??á?·á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "á??á??á??á? á?¶á??â??á??á?¶á??â??á??á??á??á??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á?¼á??á??á??á??á?¶á??á??"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á?? IPv6 á??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??â??á?¢á?¶á??â??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á??á?? TYPE á??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index 14595d18f..5828df480 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # ilbe123 <a3057016@xxxxxxxxx>, 2014
 # Chris Park <utopinator@xxxxxxxxx>, 2016
 # snotree <cknblue@xxxxxxxxx>, 2017
@@ -27,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-10 10:10+0000\n"
-"Last-Translator: woo lee <leewoo0614@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? ë¬´ì?¸ê°? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "ë²?ê·¸ë¥¼ ë³´ê³ í??ê¸°"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ì??ì?¤ ì½?ë??"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "ë³?ê²½ ê¸°ë¡?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ì?°ë?½í??ê¸°"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ëª¨ë?? ì? í??"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRì½?ë?? ë³´ê¸°"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ë¸?ë¦¿ì§? ë?¼ì?¸ì?? ì??í?? QRì½?ë??"
 
@@ -85,58 +99,58 @@ msgstr "ë¸?ë¦¿ì§? ë?¼ì?¸ì?? ì??í?? QRì½?ë??"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "ì?´ë¨¸ë??, ë?ê°? ì??ëª»ë??ì??ì?µë??ë?¤!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR ì½?ë??ë¥¼ ë¶?ë?¬ ì?¤ë?? ì¤? ì?¤ë¥?ê°? ì??ê¸´ ê²? ê°?ì?µë??ë?¤."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "ì?´ QRì½?ë??ë?? ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ì?? í?¬í?¨í??ê³  ì??ì?µë??ë?¤. ë¸?ë¦¿ì§? í??ì?? ë?¤ë¥¸ ê¸°ê¸°ë¡? ë³µì?¬í??ë ¤ë©´ QRì½?ë?? ë¦¬ë??ë¡? ì?¤ìº?í??ì?¸ì??."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "í??ì?¬ ì?¬ì?©í?  ì?? ì??ë?? ë¸?ë¦¿ì§?ê°? ì??ì?µë??ë?¤..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "%s ë??ë??ì??ê°?ì?? %s ë?¤ë¥¸ ë¸?ë¦¿ì§? í??ì??ë?? ê³¨ë?¼ë³´ì?¸ì??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor ë¸?ë?¼ì?°ì ? %së¥¼ ë?¤ì?´ë°?ì?µë??ë?¤ "
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ë¸?ë¦¿ì§? %së¥¼ ê°?ì ¸ì?µë??ë?¤"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%së?¨ê³? "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
@@ -145,27 +159,27 @@ msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sê·¸%së?¥ ë¸?ë¦¿ì§? ì£¼ì?¸ì??!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "ê³ ê¸? ì?µì??"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ì??ì??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%së?¤!%s"
@@ -173,7 +187,7 @@ msgstr "%së?¤!%s"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%së¸?%së¦¿ì§? ì?»ê¸°"
@@ -217,7 +231,7 @@ msgstr "ì ?ê¸°, %sì?¼! "
 msgid "Hello, friend!"
 msgstr "ì??ë?? ì¹?êµ¬!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "ê³µê°? í?¤"
 
@@ -267,7 +281,7 @@ msgid ""
 "\n"
 msgstr "ê±°ê¸°ë?¤, BridgeDBë?? %s Pluggable Transportê°? ì??ë?? %s\ní??í?´ë¹ ì§? ë¸?ë¦¿ì§?ë?¤ë?? ë§?ì??ì??. ë??ë?¨í?? ì??ë¦¬ê°?ì§? ì??ê² ì§?ë§?,\nê·¸ë??ë?? ì?¬ë?¬ ëª¨ë¡? ì?¸í?°ë?· ê²?ì?´ ì?°í??ë¥¼ ë??ì??ì¤?ë??ë?¤.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "'ë¸?ë¦¿ì§?'ë???"
 
@@ -285,8 +299,8 @@ msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?? ì?? ì??ë?? ë?¤ë¥¸ ë°©ë²?ì?? %s ë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì??ë?? ê²?ì??ë??ë?¤.\nì?´ ì?´ë©?ì?¼ ì??ë¹?ì?¤ë¥¼ í?µí?´ì?? ë³´ë?´ì??ì?¼ í??ë?¤ë?? ê²?ì?? ëª?ì?¬í?´ ì£¼ì?¸ì?? :\n%s, %s, %s"
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "ë¸?ë¦¿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ë§?ì?½ Torê°? ì??ë??í??ì§? ì??ì?¼ë©´, %së¡? ì?´ë©?ì?¼ì?? ë³´ë?´ ì£¼ì?¸ì??. "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ê°?ë?¥í?? í?? ë§?ì?? ì ?ë³´ë¥¼ í?¬í?¨í?´ì£¼ì?¸ì??.\nì??ë¥¼ ë?¤ì?´ ë¸?ë¦¿ì§? ëª©ë¡? ë°? ì?¬ì?©í??ë ¤ë?? Pluggable Transport,\nTor ë¸?ë?¼ì?°ì ? ë²?ì ?, Torê°? ì¤? ë©?ì??ì§? ë?±."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ë?¤ì?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?¼ì?¸ì??!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "ë¸?ë¦¿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? ê³¨ë?¼ ì£¼ì?¸ì??:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ì£¼ì??ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? ëª»í?©ë??ë?¤."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "ì?? ê·¸ë¦¼ì?? ë¬¸ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?¬ì?©í??ë?? ë°©ë²?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,21 @@ msgid ""
 msgstr "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?ë¦¬ì§?ë¥¼ ì??ë ¥í??ë ¤ë©´ ë¨¼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?ì¹¨ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë??í??ì°½ì?´ ë?¨ë©´, 'ì?¤ì ?'ì?? í?´ë¦í??ê³  ì??ë?? ì§?ë¬¸ì?´ ë??ì?¬ë??ê¹?ì§?\në§?ë²?ì?¬ë¥¼ ë?°ë?¼ì£¼ì?¸ì??:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ë?¹ì? ì?? ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨ ë??ë?? ê²?ì?´í??ë??ì???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -373,28 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??ë¥´ì?  í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ ì£¼ì?¸ì??.\në¸?ë¦¿ì§?ë¥¼ ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì?  ë¸?ë¦¿ì§?ë¥¼ í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì?  ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'ë¥¼ ë??ë?¬ ì£¼ì??ë©´ ì??ë??ë?  ê²?ì??ë??ë?¤!\në§?ì?½ ë¬¸ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "ì?¼ë°? ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ì?½ì??í?? ì?¥ì¹?ë¥¼ TYPEë¥¼ í?µí?´ì?? ì??ì²í??ì?¸ì??."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDBì?? ê³µê°? GnuPG í?¤ë¥¼ ì?»ì?µë??ë?¤."
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index b685aa689..210c377e8 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
 # Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
 # Moo, 2015-2018
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-12-04 22:30+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Atleiskite! KaÅ¾kas nutiko su jÅ«sÅ³ uÅ¾klausa."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "PraneÅ¡ti apie klaidÄ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Pirminis kodas"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "KeitiniÅ³ Å¾urnalas"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Susisiekti"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Å½ymÄ?ti viskÄ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Rodyti QR kodÄ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "JÅ«sÅ³ tinklÅ³ tilto linijÅ³ QR kodas"
 
@@ -74,58 +88,58 @@ msgstr "JÅ«sÅ³ tinklÅ³ tilto linijÅ³ QR kodas"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ajerguteliau!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Atrodo, kad gaunant jÅ«sÅ³ QR kodÄ?, Ä¯vyko klaida."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Å iame QR kode yra jÅ«sÅ³ tinklÅ³ tilto linijos. Nuskenuokite Å¡Ä¯ kodÄ?, naudodami QR kodÅ³ skaitytuvÄ?, kad nukopijuotumÄ?te savo tinklÅ³ tilto linijas Ä¯ mobilÅ³jÄ¯ ar kitus Ä¯renginius."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Å iuo metu nÄ?ra prieinami jokie tinklÅ³ tiltai..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "GalbÅ«t, jums reikÄ?tÅ³ pabandyti %s grÄ¯Å¾ti atgal %s ir pasirinkti kitÄ? tinklÅ³ tilto tipÄ?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s Å¾ingsnis "
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "AtsisiÅ³skite %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s Å¾ingsnis "
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Gaukite %s tinklÅ³ tiltus %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s Å¾ingsnis "
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Dabar, %s pridÄ?kite tinklÅ³ tiltus Ä¯ Tor Browser %s"
@@ -134,27 +148,27 @@ msgstr "Dabar, %s pridÄ?kite tinklÅ³ tiltus Ä¯ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%siesiog suteikite man tinklÅ³ tiltus!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "IÅ¡plÄ?stiniai parametrai"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "nÄ?ra"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%saip!"
@@ -162,7 +176,7 @@ msgstr "%sT%saip!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%sauti tinklÅ³ tiltus"
@@ -206,7 +220,7 @@ msgstr "Sveiki, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiki!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VieÅ¡ieji raktai"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "Be to, BridgeDB taip pat turi ir paprastus tinklÅ³ tiltus %s be jokiÅ³\nprijungiamÅ³ perdavimÅ³ %s, kurie, galbÅ«t, ir neskamba patraukliai, taÄ?iau vis tiek\ndaugeliu atvejÅ³ gali padÄ?ti apeiti interneto cenzÅ«rÄ?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Kas yra tinklÅ³ tiltai?"
 
@@ -274,8 +288,8 @@ msgstr "Man reikia alternatyvaus bÅ«do tinklÅ³ tiltams gauti!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Kitas bÅ«das gauti tinklÅ³ tiltus yra siusti el. laiÅ¡kÄ? Ä¯ %s. TurÄ?kite omenyje, kad laiÅ¡kus\nbÅ«tina siÅ³sti, naudojant vieno iÅ¡ Å¡iÅ³ el. paÅ¡to tiekÄ?jÅ³ adresÄ?: \n%s, %s ar %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Mano tinklÅ³ tiltai neveikia! Man reikia pagalbos!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jeigu jÅ«sÅ³ Tor neveikia, turÄ?tumÄ?te paraÅ¡yti el. laiÅ¡kÄ? adresu %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Pasistenkite Ä¯traukti kuo daugiau informacijos apie savo situacijÄ?, Ä¯skaitant\ntinklÅ³ tiltus ir prijungiamus perdavimus, kuriais naudojotÄ?s, taip pat savo Tor narÅ¡yklÄ?s versijÄ?,\nbei bet kokius praneÅ¡imus, kuriuos parodÄ? Tor ir t. t."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Å tai jÅ«sÅ³ tinklÅ³ tilto linijos:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Gauti tinklÅ³ tiltus!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "PraÅ¡ome paÅ¾ymÄ?ti tinklÅ³ tilto tipo parametrus:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ar jums reikia IPv6 adresÅ³?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ar jums reikia %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«sÅ³ narÅ¡yklÄ? netinkamai atvaizduoja paveikslus."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ä®veskite simbolius iÅ¡ aukÅ¡Ä?iau esanÄ?io paveikslo..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kaip pradÄ?ti naudotis tinklÅ³ tiltais"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "NorÄ?dami pridÄ?ti tinklÅ³ tiltus Ä¯ Tor Browser, pirmiausia turite nueiti Ä¯ %s Tor narÅ¡yklÄ?s atsisiuntimo\npuslapÄ¯ %s ir sekdami instrukcijas atsisiÅ³sti ir paleisti\nTor narÅ¡yklÄ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kai pasirodys langas \"Tor tinklo nustatymai\", spauskite \"KonfigÅ«ruoti\" ir sekite\nvediklÄ¯ tol, kol jis papraÅ¡ys:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ar jÅ«sÅ³ interneto paslaugÅ³ tiekÄ?jas (ISP) blokuoja ar kitaip cenzÅ«ruoja prisijungimus\nprie Tor tinklo?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Pasirinkite \"Taip\" ir tuomet \"Kitas\". NorÄ?dami konfigÅ«ruoti naujus tinklÅ³ tiltus, nukopijuokite ir\nÄ¯dÄ?kite tinklÅ³ tiltÅ³ linijas Ä¯ tekstinÄ¯ Ä¯vesties laukelÄ¯. Galiausiai, spustelÄ?kite \"Prisijungti\" ir\nviskas turÄ?tÅ³ veikti! Jei iÅ¡kils nesklandumÅ³, pabandykite spustelÄ?ti \"Tor tinklo nustatymuose\" esantÄ¯ \"Å½inyno\" mygtukÄ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Rodo Å¡Ä¯ praneÅ¡imÄ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "UÅ¾klausti paprastÅ³ tinklÅ³ tiltÅ³."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "UÅ¾klausti IPv6 tinklÅ³ tiltÅ³."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "UÅ¾klausti prijungiamÅ³ perdavimÅ³ pagal TIPÄ?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Gauti BridgeDB vieÅ¡ojo GnuPG rakto kopijÄ?."
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index 367a38259..171b59fe3 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012
 # Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2013-2015
 # ThePirateDuck <thepirateduck.w@xxxxxxxxx>, 2014
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Atvainojiet! Notikusi ar JÅ«su pieprasÄ«jumu saistÄ«ta kÄ¼Å«me."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "ZiÅ?ot par kÄ¼Å«du"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Pirmkods"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "IzmaiÅ?u Å¾urnÄ?ls"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "SazinÄ?ties"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "AtlasÄ«t visu"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "ParÄ?dÄ«t QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode JÅ«su tiltu rindÄ?m"
 
@@ -69,58 +83,58 @@ msgstr "QRCode JÅ«su tiltu rindÄ?m"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ak, man' dieniÅ?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "SÄ·iet, ka, saÅ?emot JÅ«su QRCode, notika kÄ¼Å«da."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ?jiet to ar QRCode lasÄ«tÄ?ju, lai iekopÄ?tu JÅ«su tiltu rindas mobilajÄ? tÄ?lrunÄ« un citÄ?s iekÄ?rtÄ?s."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Å obrÄ«d nav pieejamu tiltu..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "IespÄ?jams, ka Jums jÄ?mÄ?Ä£ina %s atgriezties %s un izvÄ?lÄ?ties citu tiltu veidu!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Solis %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "LejuplÄ?dÄ?t %s PÄ?rlÅ«ku Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Solis %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "SaÅ?emt %s tiltus %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Solis %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
@@ -129,27 +143,27 @@ msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%sikai dodiet man tiltus!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "LietpratÄ?ju opcijas "
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "NÄ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "nekas"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÄ?!"
@@ -157,7 +171,7 @@ msgstr "%sJ%sÄ?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%saÅ?emt tiltus"
@@ -201,7 +215,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiks, draug!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "PubliskÄ?s atslÄ?gas"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "TurklÄ?t BridgeDB ir pietiekami daudz parastu, vienkÄ?rÅ¡u tiltu %s bez jebkÄ?diem\nPluggable Transports %s, kas iespÄ?jams neizklausÄ?s tik inÄ?Ä«gi, bet arÄ« tie var\ndaudzos gadÄ«jumos palÄ«dzÄ?t apiet interneta cenzÅ«ru.\n \n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Kas ir tilti?"
 
@@ -269,8 +283,8 @@ msgstr "Man nepiecieÅ¡ams alternatÄ«vs tiltu iegÅ«Å¡anas veids!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "VÄ?lviens veids kÄ? saÅ?emt tiltus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ?rojiet, ka e-pasts ir\njÄ?nosÅ«ta no viena no sekojoÅ¡ajiem e-pasta pakalpojumu sniedzÄ?jiem:\n%s, %s vai %s."
+"%s or %s."
+msgstr "VÄ?l cits veids kÄ? saÅ?emt tiltu sarakstus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ?rojiet, ka e-pasts jÄ?nosÅ«ta no norÄ?dÄ«to e-pasta pakalpojumu sniedzÄ?ju nodroÅ¡inÄ?tas adreses:\n%s vai %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Mani tilti nestrÄ?dÄ?! Man nepiecieÅ¡ama palÄ«dzÄ«ba!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ja JÅ«su Tor nestrÄ?dÄ?, Jums jÄ?nosÅ«ta e-pasts %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Centieties iekÄ¼aut pÄ?c iespÄ?jas daudz informÄ?ciju par savu situÄ?ciju, tostarp pievienojot to tiltu un Pluggable Transports sarakstu, kurus centÄ?ties izmantot, savu Tor Browser versiju un visus Tor ziÅ?ojumus, un citu lÄ«dzÄ«gu informÄ?ciju."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Te ir JÅ«su tiltu lÄ«nijas:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "SaÅ?emt Tiltus!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Vai ir nepiecieÅ¡amas IPv6 adreses?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Vai ir nepiecieÅ¡ams %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "KÄ? sÄ?kt izmantot JÅ«su tiltus"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "Lai pÄ?rlÅ«kÄ? Tor ievadÄ«tu tiltus, vispirms dodieties uz %s pÄ?rlÅ«ka Tor lejuplÄ?des \nlapu %s un tad sekojiet pÄ?rlÅ«ka Tor lejupielÄ?des un sÄ?kÅ¡anas norÄ?dÄ?m."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kad uznirst dialogs \"Tor tÄ«kla iestatÄ«jumi\", noklikÅ¡Ä·iniet \"KonfigurÄ?t\" un sÄ?kojiet\nvednim lÄ«dz tas jautÄ?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Vai JÅ«su Interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai citÄ?dÄ? veidÄ? cenzÄ? savienojumus\nar tÄ«klu Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Atlasiet \"JÄ?\" un tad noklikÅ¡Ä·iniet \"TÄ?lÄ?k\". Lai konfigurÄ?tu savus jaunos tiltus, kopÄ?jiet un\nielÄ«mÄ?jiet tiltu lÄ«nijas teksta ievades lodziÅ?Ä?. BeigÄ?s nokliÅ¡Ä·iniet \"Izveidot savienojumu\" un\nvisam vajadzÄ?tu notikt! Ja ir problÄ?mas, turpmÄ?kai palÄ«dzÄ«bai pamÄ?Ä£iniet nokliÅ¡Ä·inÄ?t vednÄ« \"Tor tÄ«kla iestatÄ«jumi\" pogu \"PalÄ«dzÄ«ba\"."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "RÄ?da ziÅ?ojumu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "PieprasÄ«t parastos tiltus."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "PieprasÄ«t IPv6 tiltus."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "PieprasÄ«t Pluggable Transport pÄ?c TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "SaÅ?emt BridgeDB publiskÄ?s GnuPG atslÄ?gas kopiju."
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index 1e5cc369c..6684a20d3 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Cacko Cackoas <cackothe@xxxxxxxxx>, 2015
 # Viktor Hristov, 2014
 # Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-11-06 01:52+0000\n"
-"Last-Translator: Zarko Gjurov <zarkogjurov@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½ÐµÑ?Ðµ! Ð¡Ðµ Ñ?Ð»Ñ?Ñ?Ð¸ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð¾ Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð±Ð°Ñ?Ð°Ñ?Ðµ."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?ÐµÐ½ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð?Ð¾Ð³ Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð´Ð±ÐµÑ?Ð¸ Ñ?Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸"
 
@@ -69,58 +83,58 @@ msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð?ÐµÐ»Ðµ Ð¼Ð°Ñ?ÐºÐ¾!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð¼Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð´Ð¾Ð±Ð¸Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? QR ÐºÐ¾Ð´."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð?Ð²Ð¾Ñ? QR ÐºÐ¾Ð´ Ð³Ð¸ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ? Ð³Ð¾ Ñ?Ð¾ QR ÐºÐ¾Ð´ Ñ?Ð¸Ñ?Ð°Ñ? Ñ?.Ðµ. Ñ?Ð¾ ÐºÐ°Ð¼ÐµÑ?Ð°Ñ?Ð° Ð·Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð¼Ð¾Ð±Ð¸Ð»ÐµÐ½ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ Ð¸Ð»Ð¸ Ð´Ñ?Ñ?Ð³ Ñ?Ñ?ÐµÐ´."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶ÐµÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ðµ %s Ð²Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð°Ð·Ð°Ð´ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³ Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
@@ -129,27 +143,27 @@ msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð´Ð°Ñ? Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
@@ -157,7 +171,7 @@ msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
@@ -201,7 +215,7 @@ msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ»Ñ?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¸"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %sÐ±ÐµÐ· Ð½Ð¸Ñ?Ñ? ÐµÐ´ÐµÐ½\nPluggable Transports %s Ð¿Ñ?ÐµÐºÑ? ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶ÐµÐ±Ð¸ Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ ÐºÑ?Ð», Ð½Ð¾ Ñ?Ð¸Ðµ Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð¼Ð¾Ð¶Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð²Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸?"
 
@@ -269,8 +283,8 @@ msgstr "Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ð¼
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ðµ Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s. \nÐ?Ð°Ð±ÐµÐ»ÐµÑ?ÐºÐ°: Ð?Ð¾Ñ?Ð°Ñ?Ðµ\nÐ´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð½Ð° ÐµÐ´ÐµÐ½ Ð¾Ð´ Ñ?Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° / Ðµ-Ð¼Ð°Ð¸Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð¸:\n%s, %s Ð¸Ð»Ð¸ %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ñ?Ð¾Ð³Ð°Ñ? Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?ÐºÐ»Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð¾ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸ Ñ?Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð»Ð¸Ñ?Ñ?Ð° Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð¸ Pluggable Transports ÐºÐ¾Ð¸ Ð¿Ñ?Ð¾Ð±Ð°Ð²Ñ?Ðµ Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð½Ð° Tor Browser,\nÐ¸ Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð°ÐºÐ¸ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð°Ð²Ð° Tor Ð²Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ñ?, Ð¸Ñ?Ð½."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐ½Ñ?Ð¸Ð¸:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð·Ð° Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð»Ð¸ Ñ?Ð¸ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ð½Ðµ Ð³Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ñ?Ð»Ð¸ÐºÐ¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð½ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ ÐºÐ°Ñ?Ð°ÐºÑ?ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´ Ñ?Ð»Ð¸ÐºÐ°Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ñ?Ðµ:"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr "Ð?Ð° Ð²Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Tor Browser, Ð¿Ñ?Ð²Ð¾ Ð¾Ð´ÐµÑ?Ðµ Ð½Ð° %s Tor Browser Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ\nÑ?Ñ?Ñ?Ð°Ð½Ð°Ñ?Ð° %s Ð¸ Ð¿Ð¾Ñ?Ð¾Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð¾Ð³Ð° Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³Ð¾Ñ? 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸' Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ\nÐ³Ð¾ Ð¸Ð½Ñ?Ñ?Ð°Ð»ÐµÑ?Ð¾Ñ? Ð´Ð¾Ð´ÐµÐºÐ° Ð´Ð° Ð²Ðµ Ð¿Ñ?Ð°Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð½ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð¡Ð»ÐµÐ´Ð½Ð¾'. Ð?Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ·Ð°Ð»ÐµÐ¿ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð¾Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ð»ÐµÑ?Ð¾. Ð?Ð° ÐºÑ?Ð°Ñ? ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð¾Ð²Ñ?Ð·Ð¸', Ð¸\nÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ñ?Ðµ Ñ?Ð¾ ÐºÐ»Ð¸ÐºÐ°Ñ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÐºÐ¾Ð¿Ñ?ÐµÑ?Ð¾ Ð²Ð¾ 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ð¾Ð²Ð°Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° IPv6 Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Pluggable Transport Ð¿Ð¾ Ñ?Ð¸Ð¿."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð° Ð¾Ð´ Ñ?Ð°Ð²Ð½Ð¸Ð¾Ñ? GnuPG ÐºÐ»Ñ?Ñ? Ð½Ð° BridgeDB."
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index afbc1ecfb..4205da6a3 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Abhishek C <abhishek.mvr@xxxxxxxxxxx>, 2018
 # ameer pb <ameerpbekm@xxxxxxxxx>, 2019
 # Christy K Kurian <christykurian2494@xxxxxxxxx>, 2018
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-12 06:36+0000\n"
-"Last-Translator: ameer pb <ameerpbekm@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à´?àµ?à´·à´®à´¿à´?àµ?à´?àµ?! à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?à´¯àµ¼à´¤àµ?à´¥à´¨à´¯à´¿àµ½ à´¤àµ?à´±àµ?à´±àµ?à´£àµ?à´?àµ? "
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à´?à´°àµ? à´¬à´?àµ? à´±à´¿à´ªàµ?à´ªàµ?à´¾àµ¼à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¯àµ?à´?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à´¸àµ?à´¾à´´àµ?à´¸àµ? à´?àµ?à´¾à´¡àµ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à´®à´¾à´±àµ?à´± à´µà´¿à´µà´°à´ªàµ?à´ªà´?àµ?à´?à´¿à´? "
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?àµ?à´?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à´?à´²àµ?à´²à´¾à´? à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr " QRCode à´?à´¾à´£à´¿à´?àµ?à´?àµ?à´?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´¾à´²à´? à´²àµ?à´¨àµ?à´?àµ¾ à´µàµ?à´£àµ?à´?à´¿ QRCode"
 
@@ -71,58 +85,58 @@ msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´¾à´²à´? à´²àµ?à´¨àµ?à´?àµ¾ à´µàµ?à´£àµ?
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à´ªà´°à´¿à´¹à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?à´? à´?à´¤àµ?à´¤à´®à´¾à´¯à´¿ "
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?à´¯àµ? à´?àµ¼ à´?àµ?à´¡àµ? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿àµ½ à´?à´°àµ? à´ªà´¿à´¶à´?àµ? à´¸à´?à´à´µà´¿à´?àµ?à´?àµ?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à´?àµ? QR à´?àµ?à´¡à´¿àµ½ à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´²àµ?àµ» à´?à´?à´?àµ?à´?à´¿à´¯à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?. à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´®àµ?à´¬àµ?àµ½ à´«àµ?à´£à´¿à´²àµ?à´?àµ?à´?àµ? à´®à´±àµ?à´±àµ? à´?à´ªà´?à´°à´£à´?àµ?à´?à´³à´¿à´²àµ?à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´²àµ?àµ» à´?àµ?à´ªàµ?à´ªà´¿ à´?àµ?à´¯àµ?à´¯àµ?à´µà´¾àµ» à´?à´¤àµ? à´?à´°àµ? QR à´?àµ?à´¡àµ? à´±àµ?à´¡à´±à´¿à´¨àµ?à´±àµ? à´¸à´¹à´¾à´¯à´¤àµ?à´¤àµ?à´?àµ? à´¸àµ?à´?à´¾àµ» à´?àµ?à´¯àµ?à´¯àµ?à´?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à´¤àµ½à´¸à´®à´¯à´? à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´? à´²à´àµ?à´¯à´®à´²àµ?à´²."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à´?à´¿à´²à´ªàµ?à´ªàµ?àµ¾ à´¤à´¾à´?àµ?à´?àµ¾ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? 1%s à´ªàµ?à´±à´?à´¿à´²àµ?à´?àµ?à´?àµ? à´ªàµ?à´¯à´¿ 1%s à´®à´±àµ?à´±àµ?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ %s  à´¡àµ?àµºà´²àµ?à´¡àµ? à´?àµ?à´¯àµ?à´¯àµ?à´? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à´?à´¨à´¿ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ?à´±à´¿ à´²àµ?à´?àµ? à´?àµ?à´?àµ?à´?à´¿à´?àµ?à´?àµ?àµ¼à´?àµ?à´?àµ?à´? %s"
@@ -131,27 +145,27 @@ msgstr "à´?à´¨à´¿ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¤à´°àµ?à´? %sÂ "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à´?àµ?à´?àµ?à´¤àµ½ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾ "
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à´µàµ?à´£àµ?à´?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à´?à´¨àµ?à´¨àµ?à´®à´¿à´²àµ?à´²"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s à´¶àµ?à´°à´¿  %s "
@@ -159,7 +173,7 @@ msgstr "%s à´¶àµ?à´°à´¿  %s "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´?àµ?à´?àµ?à´?àµ?à´? %s "
@@ -203,7 +217,7 @@ msgstr "à´¨à´®à´¸àµ?à´?à´¾à´°à´? ! %s"
 msgid "Hello, friend!"
 msgstr "à´¨à´®à´¸àµ?à´?à´¾à´°à´? à´¸àµ?à´¹àµ?à´¤àµ?à´¤àµ? !"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à´ªàµ?à´¤àµ?à´µà´¾à´¯ à´¤à´¾à´?àµ?à´?àµ?àµ½ à´?àµ?à´?àµ?à´?à´?àµ?à´?àµ¾ "
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "à´?àµ?à´?à´¾à´¤àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿à´¬à´¿à´?àµ?à´?àµ? à´?à´¨à´µà´§à´¿ à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ à´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?àµ¾ %s à´?à´²àµ?à´²à´¾à´¤àµ?à´¤ à´ªàµ?à´²àµ?à´¯à´¿àµ» à´?àµ¾ à´µà´¾à´¨à´¿à´² à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ %s à´?à´£àµ?à´?àµ?  \nà´?à´¤àµ? à´?àµ?àµ¾à´?àµ?à´?à´¾àµ» à´?à´¤àµ?à´° à´°à´¸à´? à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿à´²àµ?à´? \nà´?à´µà´¯àµ?à´?àµ?à´?àµ? à´ªà´² à´¸à´¾à´¹à´?à´°àµ?à´¯à´¤àµ?à´¤à´¿à´²àµ?à´?  à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´¸àµ?àµ»à´¸àµ¼à´·à´¿à´ªàµ? à´?à´´à´¿à´µà´¾à´µà´¾à´?àµ?à´?à´¾àµ» à´ªà´±àµ?à´±àµ?à´? \n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "à´?à´¨àµ?à´¤àµ?à´?àµ?à´?àµ?à´¯à´¾à´£àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ ?"
 
@@ -271,8 +285,8 @@ msgstr "à´?à´¨à´¿à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´¿à´?àµ?à´?à´¾
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´¿à´?àµ?à´?à´¾àµ» à´®à´±àµ?à´±àµ?à´°àµ? à´µà´´à´¿ à´?à´³àµ?à´³à´¤àµ? à´?à´®àµ?à´¯à´¿àµ½ à´?à´¯à´?àµ?à´?à´²à´¾à´£àµ?  %s. à´¦à´¯à´µà´¾à´¯à´¿ à´¶àµ?à´°àµ?à´¦àµ?à´§à´¿à´?àµ?à´?àµ?à´?Â \nà´¨à´¿à´?àµ?à´?àµ¾ à´¨à´¿àµ¼à´¬à´¨àµ?à´§à´®à´¾à´¯àµ?à´? à´¤à´¾à´´àµ? à´ªà´±à´¯àµ?à´¨àµ?à´¨ à´¸àµ?à´µà´¨ à´¦à´¾à´¦à´¾à´?àµ?à´?à´³àµ?à´?àµ? à´?à´®àµ?à´¯à´¿à´²à´¿àµ½ à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´®àµ?à´¯à´¿àµ½ à´?à´¯à´?àµ?à´?àµ?à´? \n%s, %s à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½  %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "à´?à´¨àµ?à´±àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?àµ¼ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½ à´¤àµ?àµ¼à´?àµ?à´?à´¯à´¾à´¯àµ?à´? à´?à´®àµ?à´¯à´¿àµ½ à´?à´¯à´?àµ?à´?àµ?à´? %s"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à´?à´¿à´?àµ?à´?à´¾à´µàµ?à´¨àµ?à´¨ à´?à´¤àµ?à´°à´¯àµ?à´? à´ªàµ?à´°à´¶àµ?à´¨ à´µà´¿à´µà´°à´?àµ?à´?àµ¾ à´?àµ?à´?àµ?à´?à´¿à´?àµ?à´?àµ?àµ¼à´?àµ?à´?à´¾àµ» à´¶àµ?à´°àµ?à´®à´¿à´?àµ?à´?àµ?à´? , \nà´?àµ?à´?àµ?à´?à´¤àµ?à´¤à´¿àµ½ à´¨à´¿à´?àµ?à´?àµ¾ à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´?àµ?à´?à´¿à´?à´¯àµ?à´? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´? à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ à´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ?à´?àµ?à´?à´³àµ?à´¯àµ?à´? à´?àµ¾à´ªàµ?à´?àµ?à´¤àµ?à´¤àµ?à´? , à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸à´±à´¿à´¨àµ?à´±àµ? à´µàµ?àµ¼à´·à´¨àµ?à´? \nà´?àµ?à´?à´¾à´¤àµ? à´?à´¤àµ?à´?àµ?à´?à´¿à´²àµ?à´? à´¸à´¨àµ?à´¦àµ?à´¶à´?àµ?à´?àµ¾ à´?àµ?àµ¼ à´¤à´¨àµ?à´¨à´¿à´?àµ?à´?àµ?à´£àµ?à´?àµ?à´?àµ?à´?à´¿àµ½ à´?à´¤àµ?à´? ."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "à´?à´¤à´¾à´£àµ? à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´?àµ?à´?à´¿à´? :"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "à´¦à´¯à´µà´¾à´¯à´¿ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´?à´àµ?à´¦à´?àµ?à´?àµ¾ à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? :"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´? à´ªà´¿ à´µà´¿ 6 à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ??"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´?à´°àµ? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´¿à´¤àµ?à´°à´?àµ?à´?àµ¾ à´µàµ?à´£àµ?à´? à´°àµ?à´¤à´¿à´¯à´¿àµ½ à´ªàµ?à´°à´¦à´°àµ?à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´² ."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr " à´®àµ?à´?à´³à´¿àµ½ à´?à´¾à´£àµ?à´¨àµ?à´¨ à´?à´¿à´¤àµ?à´°à´¤àµ?à´¤à´¿àµ½ à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´?àµ?à´·à´°à´?àµ?à´?àµ¾ à´?àµ?àµ¼à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à´?à´?àµ?à´?à´¨àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ? à´¤àµ?à´?à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ?à´°à´¿à´²àµ?à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?àµ?àµ¼à´?àµ?à´?à´£à´®àµ?à´?àµ?à´?à´¿àµ½ , à´?à´¦àµ?à´¯à´? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´±à´?àµ?à´?à´¿à´µàµ?à´?àµ?à´?àµ?à´¨àµ?à´¨ %s à´µàµ?à´¬àµ? à´¸àµ?à´±àµ?à´±à´¿à´²àµ?à´?àµ? à´ªàµ?à´?àµ?à´? \n%s à´?à´¨àµ?à´¨à´¿à´?àµ? à´?à´µà´¿à´?àµ? à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´±à´?àµ?à´?à´¿à´µàµ?à´?àµ?à´?à´¾à´¨àµ?à´? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´¤àµ?à´?à´?àµ?à´?à´¾à´¨àµ?à´®àµ?à´³àµ?à´³ \nà´¨à´¿àµ¼à´¦àµ?à´¶à´?àµ?à´?àµ¾ à´ªà´¿à´¨àµ?à´¤àµ?à´?à´°àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´µàµ¼à´?àµ?à´?à´¿à´¨àµ?à´±àµ? à´¸à´?àµ?à´?àµ?à´?à´°à´£ à´?à´¾à´²à´?à´? à´µà´°àµ?à´®àµ?à´ªàµ?àµ¾ , à´?àµ?àµºà´«à´¿à´?à´±à´¿àµ½ à´?à´®àµ¼à´¤àµ?à´¤àµ?à´?à´¯àµ?à´? à´?à´µà´¶àµ?à´¯à´ªàµ?à´ªàµ?à´?àµ?à´¨àµ?à´¨ \nà´¨à´¿àµ¼à´¦àµ?à´¶à´?àµ?à´?àµ¾ à´ªà´¿à´¨àµ?à´¤àµ?à´?à´°àµ?à´?à´¯àµ?à´? à´?àµ?à´¯àµ?à´¯àµ?à´? :"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´¨àµ?à´±àµ¼à´¨àµ?à´±àµ?à´±àµ? à´¸àµ?à´µà´¨ à´¦à´¾à´¤à´¾à´µàµ? ( à´? à´?à´¸àµ? à´ªà´¿ )à´?àµ?àµ¼ à´¶àµ?à´?à´?à´²à´¯à´¿à´²àµ?à´?àµ?à´?àµ?à´³àµ?à´³ à´¬à´¨àµ?à´§à´? à´¤à´?à´¸àµ?à´¸à´ªàµ?à´ªàµ?à´?àµ?à´¤àµ?à´¤àµ?à´?à´¯àµ? \nà´®à´±àµ?à´±àµ? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨àµ?à´£àµ?à´?àµ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "à´?à´¤àµ? à´?à´¨àµ?à´¨àµ?à´? à´¤àµ?à´?à´°àµ?à´? à´?à´¨àµ?à´¨àµ?à´? à´?à´®àµ¼à´¤àµ?à´¤àµ?à´? . à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸à´?àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?à´¾àµ» , \nà´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´°à´¿à´?àµ¾ à´?àµ?à´?àµ?à´¸àµ?à´±àµ?à´±àµ? à´¬àµ?à´?àµ?à´¸à´¿à´²àµ?à´?àµ? à´ªà´?àµ¼à´¤àµ?à´¤àµ?à´?à´¯àµ?à´? à´?à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´?à´¯àµ?à´? à´?àµ?à´¯àµ?à´¯àµ?à´?. à´?à´µà´¸à´¾à´¨à´®à´¾à´¯à´¿ 'à´?à´£à´?àµ?à´?à´¿àµ½' à´?à´®àµ¼à´¤àµ?à´¤àµ?à´?, à´?àµ?à´?à´¾à´¤àµ? \nà´¨à´¿à´?àµ?à´?àµ¾ à´¤à´¯àµ?à´¯à´¾à´±à´¾à´¯à´¿! à´?à´¨à´¿ à´¨à´¿à´?àµ?à´?àµ¾ à´?à´¨àµ?à´¤àµ?à´?àµ?à´?à´¿à´²àµ?à´? à´ªàµ?à´°àµ?à´¶àµ?à´¨à´?àµ?à´?àµ¾ à´?à´à´¿à´®àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? à´?à´£àµ?à´?àµ?à´?à´¿àµ½, à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´±àµ?â??à´µàµ¼à´?àµ?à´?àµ? à´¸àµ?à´±àµ?à´±à´¿à´?à´?àµ?à´¸àµ? \nà´?à´¨àµ?à´¨ à´¸à´¹à´¾à´¯ à´¨à´¿àµ¼à´¦àµ?à´¦àµ?à´¶ à´?à´¾à´²à´?à´¤àµ?à´¤à´¿à´²àµ? à´¹àµ?à´²àµ?à´ªà´¿àµ½ à´?à´®àµ¼à´¤àµ?à´¤àµ?à´? ."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à´? à´¸à´¨àµ?à´¦àµ?à´¶à´? à´ªàµ?à´°àµ?à´¦à´°àµ?à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "à´µà´¾à´¨à´¿à´² à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "à´? à´ªà´¿ à´µà´¿ 6 à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "à´?à´°àµ? à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ à´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ? à´°àµ?à´¤à´¿ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¡à´¿ à´¬à´¿ à´¯àµ?à´?àµ? à´ªàµ?à´¤àµ?à´µà´¾à´¯ à´?à´°àµ? à´?àµ?à´¨àµ? à´ªà´¿ à´?à´¿ à´?àµ? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´? "
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index ec3f14ea9..8b2925d35 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Vikrant Korde <vikrant.korde@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: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 18:38+0000\n"
-"Last-Translator: Vikrant Korde <vikrant.korde@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¤?à¥?à¤·à¤®à¤¸à¥?à¤µ! à¤?à¤¾à¤¹à¥?à¤¤à¤°à¥? à¤?à¥?à¤? à¤?à¤¾à¤²à¥? à¤?à¤¹à¥?"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à¤¦à¥?à¤· à¤¨à¥?à¤?à¤¦à¤µà¤¾"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à¤¸à¥?à¤?à¤°à¥?à¤¸ à¤?à¥?à¤¡"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à¤¬à¤¦à¤² à¤²à¥?à¤?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¤¸à¤?à¤ªà¤°à¥?à¤?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¤¸à¤°à¥?à¤µ à¤¨à¤¿à¤µà¤¡à¤¾"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "à¤?à¥?à¤¯à¥?à¤?à¤° à¤?à¥?à¤¡ à¤¦à¤°à¥?à¤¶à¤µà¤¾"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¤?à¥?à¤¯à¥? à¤?à¤° à¤?à¥?à¤¡ à¤®à¤¿à¤³à¤µà¤¤à¤¾à¤¨à¤¾ à¤?à¤¡à¤¬à¤¡ à¤?à¤¾à¤²à¥?"
 
@@ -67,58 +81,58 @@ msgstr "à¤?à¥?à¤¯à¥? à¤?à¤° à¤?à¥?à¤¡ à¤®à¤¿à¤³à¤µà¤¤à¤¾à¤¨à¤¾ à¤?à¤¡à¤¬à¤¡ à¤?
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à¤? à¤¹à¥? !"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¤®à¤¿à¤³à¤µà¤¤à¤¾à¤¨à¤¾ à¤?à¤¡à¤¬à¤¡ à¤?à¤¾à¤²à¥?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¤¹à¥?à¤¯à¤¾ QR à¤?à¥?à¤¡ à¤®à¤§à¥?à¤¯à¥? à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥? à¤?à¤¹à¥?à¤¤. à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥? à¤®à¥?à¤¬à¤¾à¤?à¤² à¤?à¤£à¤¿ à¤?à¤¤à¤° à¤¸à¤¾à¤§à¤¨à¤¾à¤?à¤µà¤° à¤µà¤°  à¤?à¥?à¤ªà¥? à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? QR à¤?à¥?à¤¡ à¤µà¤¾à¤?à¤?à¤¾à¤¨à¥? à¤¸à¥?à¤?à¥?à¤¨ à¤?à¤°à¤¾."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à¤¸à¤§à¥?à¤¯à¤¾ à¤?à¥?à¤£à¤¤à¥?à¤¹à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¾à¤¹à¥?à¤¤ ... "
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¤¤à¥?à¤®à¥?à¤¹à¥? %s à¤®à¤¾à¤?à¥? %s à¤?à¤¾à¤?à¤¨ à¤¦à¥?à¤¸à¤°à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤¨à¤¿à¤µà¤¡à¤¾à¤µà¤¾"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ %s à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¤?à¤¤à¤¾ %s à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤®à¤§à¥?à¤¯à¥? à¤?à¤¾à¤?à¤¾ %s"
@@ -127,27 +141,27 @@ msgstr "à¤?à¤¤à¤¾ %s à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤®
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¤®%sà¤²à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤¦à¥?à¤¯à¤¾!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à¤ªà¥?à¤°à¤?à¤¤ à¤ªà¤°à¥?à¤¯à¤¾à¤¯"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à¤¨à¤¾à¤¹à¥?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à¤?à¤¾à¤¹à¥?à¤¹à¥? à¤¨à¤¾à¤¹à¥?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¤¹à¥?%sà¤¯!"
@@ -155,7 +169,7 @@ msgstr "%sà¤¹à¥?%sà¤¯!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
@@ -199,7 +213,7 @@ msgstr "à¤?à¤¯, %s!"
 msgid "Hello, friend!"
 msgstr "à¤¹à¥?à¤²à¥?, à¤®à¤¿à¤¤à¥?à¤°à¤¾ !"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¤ªà¤¬à¥?à¤²à¤¿à¤? à¤?à¤¿à¤?à¥?"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤®à¥?à¤¹à¤£à¤?à¥? à¤?à¤¾à¤¯?"
 
@@ -267,7 +281,7 @@ msgstr "à¤®à¤²à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤®à¤¿à¤³à¤µà¤£à¥?à¤¯à¤¾à¤¸à¤¾à¤ à¥? à¤ª
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr "à¤®à¤¾à¤?à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¾à¤°à¥?à¤¯ à¤?à¤°à¤¤ à¤¨à¤¾à¤¹
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à¤?à¤ªà¤²à¥? à¤?à¥?à¤° à¤?à¤¾à¤²à¤¤ à¤¨à¤¸à¥?à¤² à¤¤à¤°, %s à¤?à¤¥à¥? à¤?à¤®à¥?à¤² à¤?à¤°à¤¾."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
 msgid "Here are your bridge lines:"
 msgstr "à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "à¤¬à¥?à¤°à¤¿à¤? à¤ªà¥?à¤°à¤?à¤¾à¤°à¤¾à¤¤à¥?à¤² à¤ªà¤°à¥?à¤¯à¤¾à¤¯ à¤¨à¤¿à¤µà¤¡à¤¾:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à¤?à¤ªà¤£à¤¾à¤¸ IPv6 à¤ªà¤¤à¥?à¤¤à¥? (addresses) à¤¹à¤µà¥? à¤?à¤¹à¥?à¤¤ à¤?à¤¾? "
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¤?à¤ªà¤£à¤¾à¤¸ %s à¤¹à¤µà¥? à¤?à¤¹à¥? à¤?à¤¾?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "à¤?à¤ªà¤²à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤ªà¥?à¤°à¤¤à¤¿à¤®à¤¾ à¤¨à¥?à¤? à¤¦à¤¾à¤?à¤µà¤¤ à¤¨à¤¾à¤¹à¥?. "
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "à¤µà¤°à¥?à¤² à¤ªà¥?à¤°à¤¤à¤¿à¤®à¥?à¤¤à¥?à¤² à¤¶à¤¬à¥?à¤¦ à¤²à¤¿à¤¹à¤¾"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à¤?à¤ªà¤²à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¸à¥? à¤µà¤¾à¤ªà¤°à¤¾à¤µà¥?à¤¤"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à¤?à¤ªà¤²à¤¾ à¤?à¤?à¤?à¤°à¤¨à¥?à¤? à¤¸à¥?à¤µà¤¾ à¤ªà¥?à¤°à¤¦à¤¾à¤¤à¤¾ (ISP) à¤?à¥?à¤° à¤?à¤¨à¥?à¤?à¥?à¤¶à¤¨ à¤¬à¥?à¤²à¥?à¤? à¤?à¤¿à¤?à¤µà¤¾ à¤¸à¥?à¤¨à¥?à¤¸à¥?à¤° \nà¤?à¤°à¤¤à¥? à¤?à¤¹à¥? à¤?à¤¾?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à¤¹à¤¾ à¤¸à¤?à¤¦à¥?à¤¶ à¤¦à¤¾à¤?à¤µà¤¤à¥?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "à¤¸à¤§à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¤?à¥? à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "à¤ªà¥?à¤²à¤?à¥?à¤¬à¤² à¤?à¥?à¤°à¤¾à¤?à¤¸à¥?à¤ªà¥?à¤°à¥?à¤? TYPE à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB à¤¸à¤¾à¤ à¥? à¤ªà¤¬à¥?à¤²à¤¿à¤? GnuPG à¤?à¥? à¤ªà¥?à¤°à¤¤ à¤®à¤¿à¤³à¤µà¤¾."
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index 3340421db..133e5a802 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # abuyop <abuyop@xxxxxxxxx>, 2017
 # Celine Yap Suet Ling <celine.sodawine@xxxxxxxxx>, 2017
 # danial abd talib <muhammaddanialabdtalib@xxxxxxxxx>, 2014
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-09 01:07+0000\n"
-"Last-Translator: abuyop <abuyop@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Lapor kesilapan kod"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kod Sumber"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Sejarah log"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kenalan"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tunjuk Kod QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR Kod untuk talian 'bridge'"
 
@@ -74,58 +88,58 @@ msgstr "QR Kod untuk talian 'bridge'"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Alamak, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Terdapat ralat ketika cuba mendapatkan KodQR anda."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk membuat salinan talian 'bridge' ke mobil dan alat-alat lain"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Tidak ada alat 'bridge' pada masa ini..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Anda boleh cuba %s balik ke %s dan pilih jenis 'bridge' lain!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Langkah %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Muat turun%s Pelayar Web Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Langkah%s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s titi %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah%s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
@@ -134,27 +148,27 @@ msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sPilih%s secara automatik 'bridges'!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Pilihan Lanjutan"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "tiada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -162,7 +176,7 @@ msgstr "%sY%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%suna Bridges"
@@ -206,7 +220,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Hai, kawan!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Kunci Awam"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "Selain itu, BridgeDB mempunyai banyak bridges yang dicadang %stanpa diperlukan\nPluggable Transports %s yang boleh memberi rasa tidak sedap, tetapi ia masih boleh menolong rangkaian anda dilindungi dalam kebanyakan kes.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Apakah itu 'bridges'?"
 
@@ -274,8 +288,8 @@ msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Cara lain untuk dapatkan bridge adalah untuk menghantar email kepada %s. Sila ambil perhatian anda harus\nmenghantar email dengan mengunakan alamat yang diberi oleh syarikat yang menyediakan email:\n%s,%s atau %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Sila beri sebanyak mungkin informasi tentang kes anda, sila beri kandungan senarai bridge dan hubungan Pluggable Transport yang telah diguna, versi Pelayar Web Tor, dan segala mesej yang Tor paparkan, dan lain-lain .. "
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Berikut adalah bridge anda:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Dapat sambungan Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Sila pilih jenis bridge:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Anda perlukan alamat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Perlukah anda %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Pelayar anda tidak memaparkan imej dengan betul."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan imej aksara yang tertera..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Bagaimana cara untuk mula mengunakan bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "Untuk masuk bridges ke dalam Pelayar Web Tor, langkah pertama sila pilih %s halaman muat turun Pelayar Web Tor \n%s dan ikut arahan untuk muat turun dan mula Pelayar Web Tor Browser "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Bila pilihan dialog jenis hubungan 'Tor Network Settings' dipaparkan, klik 'Konfigurasi' dan ikut nasihat yang disyorkan sehingga:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Adakah Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Pilih 'Ya' dan klik 'langkah seterusnya'. Untuk konfigurasi bridge baru, buat salinan jaringan bridges ke dalam kotak input teks. Step akhir, klik 'Hubung', dan anda patut dapat keputusan positif! Jika anda ada kesulitan, sila cuba klik 'Bantuan' dalam 'Tor Network Settings' guru untuk bantuan seterusnya"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Papar mesej ini."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Pinta bridges yang disyorkan."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Pinta IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Pinta jalinan Pluggable Transport secara TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index a1e7e1b6b..79a8677e1 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2014
 # Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2016-2017
 # Erik Matson <erik@xxxxxxxxxxxxxxx>, 2015
@@ -17,17 +16,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-12-29 18:29+0000\n"
-"Last-Translator: Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -39,35 +57,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Innrapporter feil"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Endringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Velg alt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Vis QR-kode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kode for dine brolinjer"
 
@@ -75,58 +89,58 @@ msgstr "QR-kode for dine brolinjer"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Oisann!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det oppsto en feil ved innhenting av din QR-kode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Det er for tiden ingen tilgjengelige broerâ?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Last ned %s Tor-nettleseren %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Tilknytt %s broer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
@@ -135,27 +149,27 @@ msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare gi meg noen broer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Avanserte valg"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -163,7 +177,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sT%silknytt broer"
@@ -207,7 +221,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, lille venn!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸kler"
 
@@ -257,7 +271,7 @@ msgid ""
 "\n"
 msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av Internettsensur i de fleste fall.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Hva er broer?"
 
@@ -275,8 +289,8 @@ msgstr "Jeg trenger en alternativ mÃ¥te Ã¥ fÃ¥ broer pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "En annen mÃ¥te tilknytte seg broer er Ã¥ sende en e-post til %s. Merk at du mÃ¥ sende\ne-post fra en adresse tilhÃ¸rende en av fÃ¸lgende e-posttilbydere:\n%s, %s eller %s."
+"%s or %s."
+msgstr "En annen mÃ¥te Ã¥ tilknytte seg broer pÃ¥ er Ã¥ sende en epost til %s. Merk at du mÃ¥\nsende eposten fra en adresse tilhÃ¸rende en av fÃ¸lgende epost-tilbydere:\n%s eller %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -285,54 +299,44 @@ msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte ha produsert, osv."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Tilknytt broer!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Hvordan starte med bruk av dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +345,21 @@ msgid ""
 msgstr "For Ã¥ sette opp broer i Tor-nettleseren, gÃ¥ fÃ¸rst til %s siden for nedlasting av Tor-nettleser\n%s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor-nettleseren."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk pÃ¥ 'oppsett' og fÃ¸lg\nveiviseren til den forespÃ¸r:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -363,28 +367,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Vis denne meldingen."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "EtterspÃ¸r IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Be om en pluggbar transport etter TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "FÃ¥ kopi av BridgeDBs offentlige GnuPG-nÃ¸kkel."
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index 089ae79f8..d4f29b444 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
 # AndrÃ© Koot <meneer@xxxxxxxx>, 2016
 # Ann Boen <ann.boen@xxxxxxxxx>, 2014
@@ -14,6 +13,7 @@
 # Joren Vandeweyer <jorenvandeweyer@xxxxxxxxx>, 2019
 # 53a60eabbf5124a226a7678001f9a57b, 2015
 # Meteor 0id, 2019
+# Meteor 0id, 2019
 # Not Much <1028484728393@xxxxxxxxxxxxxx>, 2018
 # Shondoit Walker <shondoit@xxxxxxxxx>, 2011
 # Marco Brohet <inactive+therbom@xxxxxxxxxxxxx>, 2012
@@ -26,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-09 13:57+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 01:01+0000\n"
 "Last-Translator: Meteor 0id\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -48,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Een bug melden"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Lijst van wijzigingen"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode tonen"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode voor uw bridge regels"
 
@@ -84,58 +99,58 @@ msgstr "QRCode voor uw bridge regels"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Helaas pindakaas!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Er was een fout tijdens het ophalen van uw QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiÃ«ren naar mobiele of andere apparaten."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Stap %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Download %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
@@ -144,27 +159,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -172,7 +187,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%srijg Bridges"
@@ -216,7 +231,7 @@ msgstr "Hoi, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Publieke Sleutels"
 
@@ -266,7 +281,7 @@ msgid ""
 "\n"
 msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
@@ -284,8 +299,8 @@ msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Een alternatieve manier om bridges te verkrijgen is door een email te sturen naar %s. Houd er wel rekening mee dat je\nde email verstuurd via een van de volgende email aanbieders:\n%s, %s of %s."
+"%s or %s."
+msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -294,54 +309,44 @@ msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Als je Tor niet werkt, email dan naar %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr "Als het met je Tor niet lukt om verbinding te maken, lees dan naar de %s en onze %s."
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn je bridge regels:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Krijg Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Selecteer opties voor bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Heb je IPv6 adressen nodig?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heb je een %s nodig?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Voer de tekens in van de afbeelding hieronderâ?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Hoe te starten met het gebruik van je bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +355,21 @@ msgid ""
 msgstr "Om bridges toe te voegen in Tor Browser, ga eerst naar %s Tor Browser download pagina %s en volg dan de instructies voor het downloaden en starten van Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -372,28 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Toont dit bericht."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Vraag vanilla bridges aan."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Verzoek IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Vraag een Pluggable Transport op TYPE aan."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index ce1ba2253..1f3b356fd 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Katrien Igodt <kigodt@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: 2018-06-08 07:09+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Rapporteer een Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacteer"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecteer Alles"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Toon QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode voor uw bridge lines"
 
@@ -67,58 +81,58 @@ msgstr "QRCode voor uw bridge lines"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "t'Is om zeep!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Er lijkt een fout gebeurd te zijn in het verkrijgen van uw QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Deze QRCode bevat uw bridge lines. Scan deze aub met een QRCode lezer om zo uw bridge lines te kopiÃ«ren naar uw mobiele en andere toestellen. "
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar. "
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Misschien moet u proberen %s even terug %s te gaan om een andere bridge type te selecteren."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Stap %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Verkrijg %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
@@ -127,27 +141,27 @@ msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Geavanceerde Opties"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -155,7 +169,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sV%serkrijg Bridges"
@@ -199,7 +213,7 @@ msgstr "Hallo, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr "Verder heeft BridgeDB standaard bridges %s in overvloed zonder enige Pluggable Transports %s. Dit lijkt allemaal niet zo spannend, maar helpen nog steeds om in de meeste gevallen internetcensuur te omzeilen. \n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
@@ -267,8 +281,8 @@ msgstr "Ik heb een alternatieve route nodig om bridges te verkrijgen!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Een andere manier om bridges te verkrijgen is om een email te sturen naar %s. Gelieve zeker te zijn dat u uw e-mail verstuurt vanuit een e-mailadres van de volgende e-mail providers:\n%s, %s of %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Indien Tor niet werkt, dient u een e-mail te sturen naar %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Probeer zoveel mogelijk informatie mee te geven, \nzoals de lijst van\nbridges en Pluggable Transports die u probeerde te gebruiken, de versie van uw Tor Browser,\nen de meldingen die u verkreeg van Tor, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn uw bridge lines:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Verkrijg Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Gelieve opties te selecteren voor bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Heeft u IPv6 adressen nodig?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heeft u een %s nodig?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser geeft afbeeldingen niet correct weer."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Voer de karakters van de afbeelding hierboven in..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Hoe beginnen met bridges te gebruiken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr "Om bridges toe te voegen in de Tor Browser, gaat u eerst naar de %s Tor Browser download\npagina %s en volgt u daar verder instructies om de Tor Browser te downloaden en te starten."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Wanneer het 'Tor Netwerk Instellingen' dialoogvenster opent, klikt u op 'Configureer' en volgt u de wizard totdat deze vraagt: "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecteer 'Ja' en klik vervolgens op 'Volgende'. Om uw nieuwe bridges te configureren, kopieer en plak de bridge lines in het tekst invoerveld. Tenslotte, klik 'Connecteer' en u zou moeten kunnen connecteren. Indien u toch problemen ondervindt, klik dan op de 'Help' knop in de 'Tor Netwerk Instellingen' wizard voor verdere ondersteuning."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Toont dit bericht."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Vraag standaard bridges aan."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Vraag IPv6 bridges aan."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Vraag Pluggable Transport by TYPE aan."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Verkijg een kopie van de BridgeDB's public GnuPG key."
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index 5e6ebc28d..cd1710bff 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # BjÃ¸rn I., 2014-2015
 # Finn Brudal <finnbrudal@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: 2017-09-19 19:57+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Orsak! Noko gjekk gale med fÃ¸respurnaden din."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Rapporter feil"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kjeldekode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Endringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vel alle"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Vis QR-kode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-for brulinjene dine"
 
@@ -68,58 +82,58 @@ msgstr "QR-for brulinjene dine"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ojsann!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det oppstod ein feil under henting av QR-koden din."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for Ã¥ kopiera brulinjene dine over pÃ¥ mobilen og andre einingar."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ingen bruer er for tida tilgjengelege "
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Kanskje du skulle freista Ã¥ %s gÃ¥ tilbake %s og velja ei anna brutype!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Last ned %s Tor-nettlesaren %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hent %s bruer %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "No kan du %s leggja til bruene i Tor Browser %s"
@@ -128,27 +142,27 @@ msgstr "No kan du %s leggja til bruene i Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serre gje meg nokre bruer!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Avanserte innstillingar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -156,7 +170,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%snyt til bruer"
@@ -200,7 +214,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, ven!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlege nÃ¸klar"
 
@@ -250,7 +264,7 @@ msgid ""
 "\n"
 msgstr "I tillegg hev BridgeDB mange vanlege bruer %s utan nokon Pluggbare\nTransportar %s, noko som kanskje ikkje hÃ¸yrast sÃ¥ kult ut, men dei kan framleis\nhjelpa med Ã¥ koma utanum internettsensur i mange dÃ¸me.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Kva er bruer?"
 
@@ -268,8 +282,8 @@ msgstr "Eg treng ein alternativ mÃ¥te Ã¥ fÃ¥ bruer pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Eit anna vis Ã¥ fenge bruer pÃ¥ er Ã¥ sende ein e-post Ã¥t %s. Ver venleg og merk at du\nlyt sende e-posten ved hjelp av ei adressa frÃ¥ ein av dei fylgjande\ne-postÃ¥tbjodarane: %s, %s eller %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "Brua mi verkar ikkje! Eg treng hjelp!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Freist Ã¥ taka med so mange upplysingar um saka di som du kan, medrekna\nlista yver bruer og Pluggbare Transportar du freista Ã¥ nytta, Tor-nettlesarversjonen\ndin og alle meldinger som Tor gav ut, osv."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er bru-linene dine:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "FÃ¥ bruer!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ver venleg og gjer val for brutype:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Treng du IPv6-adresser?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Treng du %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Nettlesaren din viser ikkje bilete skikeleg."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn teikn frÃ¥ biletet nedanfor "
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Korleis starta Ã¥ bruka bruer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
 msgstr "For Ã¥ leggja bruer inn i Tor-nettlesaren, gakk fyst Ã¥t %s Tor-nettlesarnedlastings-\nsida %s og fylg deretter rettleiingane der for Ã¥ lasta ned og starta Tor-nettlesaren."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r 'Tor-nettverksinnstillingar'-dialogen kjem upp, klikk pÃ¥ 'Set upp' og fylg\nvegvisaren inntil han spÃ¸r:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkerer internett-tenesteÃ¥tbjodaren (ISP) din eller sensurerer han pÃ¥ anna vis\ntilkoplingar Ã¥t Tor-nettverket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -356,28 +360,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Vel 'Ja' og klikk deretter 'Neste'. For Ã¥ setja upp dei nye bruene dine, kopier og\nlim brulinene inn i tekstfeltet. Klikk Ã¥t slutt 'Kopla til', og du burde vere klÃ¥r! Um du\nupplever vanskar, freist Ã¥ klikka pÃ¥ 'Hjelp'-knappen i 'Tor-nettverksinnstillingar'-\nvegvisaren for meir hjelp."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Viser denne meldinga."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Be om bruer med fabrikkoppsett."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Be om IPv6-bruer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Be um ein Pluggbar Transport ved hjelp av TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Feng ein kopi av BridgeDBs offentlege GnuPG-lykel."
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 8003375e1..dc59dcdb0 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A S Alam <alam.yellow@xxxxxxxxx>, 2014
 # KAMALJEET SINGH, 2018
 # SONIA SINGLA <soniasingla.1812@xxxxxxxxx>, 2018
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-09-05 14:15+0000\n"
-"Last-Translator: KAMALJEET SINGH\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¨?à¨«à¨¼à¨¸à©?à¨¸ à¨¹à©? à¨?à¨¿ à¨¤à©?à¨¹à¨¾à¨¡à©? à¨¬à©?à¨¨à¨¤à©? à¨µà¨¿à¨? à¨?à©?à¨? à¨?à¨²à¨¤ à¨¹à©? à¨?à¨¿à¨? à¨¹à©? |"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à¨?à©±à¨? à¨¬à©±à¨? à¨¦à©? à¨°à¨¿à¨ªà©?à¨°à¨? à¨?à¨°à©? |"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à¨¸à¨°à©?à¨¤ à¨?à©?à¨¡ |"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à¨²à¨¾à¨? à¨¬à¨¦à¨²à©?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¨¸à©°à¨ªà¨°à¨? "
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¨¸à¨¾à¨°à©? à¨?à©?à¨£à©?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR à¨?à©?à¨¡ à¨¦à¨¿à¨?à¨¾à¨?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR à¨?à©?à¨¡ à¨¤à©?à¨¹à¨¾à¨¡à©? à¨ªà©?à©±à¨² à¨²à¨¾à¨?à¨¨à©? à¨²à¨?"
 
@@ -69,58 +83,58 @@ msgstr "QR à¨?à©?à¨¡ à¨¤à©?à¨¹à¨¾à¨¡à©? à¨ªà©?à©±à¨² à¨²à¨¾à¨?à¨¨à©? à¨²à¨?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à¨?à¨¹, à¨¸à¨ªà©?à¨?à©?à¨?à©?à¨?à¨¸!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¨?à¨?à¨¿à¨¹à¨¾ à¨²à¨?à¨¦à¨¾ à¨¹à©? à¨?à¨¿ à¨¤à©?à¨¹à¨¾à¨¡à©? QRcode à¨¨à©?à©° à¨ªà©?à¨°à¨¾à¨ªà¨¤ à¨?à¨°à¨¨ à¨µà¨¿à©±à¨? à¨?à©±à¨? à¨¤à¨°à©?à©±à¨?à©? à¨¹à©?à¨? à¨¸à©?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¨?à¨¸ QRCode à¨µà¨¿à©±à¨? à¨¤à©?à¨¹à¨¾à¨¡à©?à¨?à¨? à¨¬à©?à¨°à¨¿à¨? à¨²à¨¾à¨?à¨¨à¨¾à¨? à¨¸à¨¼à¨¾à¨®à¨¿à¨² à¨¹à¨¨ à¨?à¨ªà¨£à©? à¨ªà©?à©±à¨² à¨¸à¨¤à¨°à¨¾à¨? à¨¨à©?à©° à¨®à©?à¨¬à¨¾à¨?à¨² à¨?à¨¤à©? à¨¹à©?à¨° à¨¡à¨¿à¨µà¨¾à¨?à¨¸à¨¾à¨? à¨¤à©? à¨?à¨¾à¨ªà©? à¨?à¨°à¨¨ à¨²à¨? à¨?à¨¸ à¨¨à©?à©° QRCode à¨°à©?à¨¡à¨° à¨¨à¨¾à¨² à¨¸à¨?à©?à¨¨ à¨?à¨°à©?"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à¨?à¨¸ à¨µà©?à¨²à©? à¨?à©?à¨? à¨µà©? à¨ªà©?à¨² à¨?à¨ªà¨²à¨¬à©±à¨§ à¨¨à¨¹à©?à¨? à¨¹à©? ..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¨¸à¨¼à¨¾à¨?à¨¦ à¨¤à©?à¨¹à¨¾à¨¨à©?à©° %s à¨µà¨¾à¨ªà¨¸ à¨?à¨¾ %s à¨?à©?à¨¸à¨¼à¨¿à¨¸à¨¼ à¨?à¨°à¨¨à©? à¨ªà¨µà©?à¨?à©? à¨?à¨¤à©? à¨?à©±à¨? à¨µà©±à¨?à¨°à©? à¨ªà©?à¨² à¨¦à©? à¨?à¨¿à¨¸à¨® à¨¦à©? à¨?à©?à¨£ à¨?à¨°à©?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¨?à¨¦à¨® %s 1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à¨¡à¨¾à¨?à¨¨à¨²à©?à¨¡ %s à¨?à©?à¨° à¨¬à©?à¨°à¨¾à¨?à©?à¨° %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¨?à¨¦à¨® %s 2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¨ªà©?à¨² %s à¨²à¨µà©? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¨?à¨¦à¨® %s 3 %s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -129,27 +143,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr ""
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à¨¨à¨¹à©?à¨?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -157,7 +171,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -201,7 +215,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¨ªà¨¬à¨²à¨¿à¨? à¨?à©?à©°à¨?à©?"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "à¨ªà©?à¨² à¨?à©? à¨¹à¨¨?"
 
@@ -269,7 +283,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -279,54 +293,44 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index ce86df166..c7c0778f9 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2014
 # Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2013
 # JerBen <ayurveda63@xxxxxxxxx>, 2012
@@ -18,17 +17,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -40,35 +58,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "ZgÅ?oÅ? BÅ?Ä?d"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kod ÅºrÃ³dÅ?owy"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Lista zmian"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PokaÅ¼ KodQR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KodQR dla Twoich linii bridge"
 
@@ -76,58 +90,58 @@ msgstr "KodQR dla Twoich linii bridge"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ups, coÅ? poszÅ?o nie tak!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "WyglÄ?da na to, Å¼e napotkaliÅ?my na bÅ?Ä?d podczas prÃ³by pobrania Twojego kodu QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodÃ³w QR, aby skopiowaÄ? je do Twojego telefonu lub innych urzÄ?dzeÅ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Aktualnie nie ma dostÄ?pnych Å¼adnych mostÃ³w..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Prawdpododobnie powinieneÅ? sprÃ³bowaÄ? %s wrÃ³ciÄ? %s i wybraÄ? inny typ mostu!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Pobierz %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Pobierz %s mostki %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s dodaj mosty do Tor Browser %s"
@@ -136,27 +150,27 @@ msgstr "Teraz %s dodaj mosty do Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sP%so prostu daj mi mosty!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opcje zaawansowane"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "brak"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sak!"
@@ -164,7 +178,7 @@ msgstr "%sT%sak!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sozyskaj mosty"
@@ -208,7 +222,7 @@ msgstr "Witaj, %s!"
 msgid "Hello, friend!"
 msgstr "Witaj przyjacielu!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Klucze Publiczne"
 
@@ -258,7 +272,7 @@ msgid ""
 "\n"
 msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostÃ³w %s bez \njakichkolwiek pluggable transports %s, ktÃ³re mogÄ? wydawaÄ? siÄ? niezbyt przydatne, \njednak w wielu przypadkach mogÄ? pomÃ³c w obejÅ?ciu cenzury.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Czym sÄ? mostki?"
 
@@ -276,8 +290,8 @@ msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostkÃ³w!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Innym sposobem na pozyskanie mostu jest wysÅ?anie wiadomoÅ?ci e-mail na adres %s. ProszÄ? pamiÄ?taÄ?, Å¼e naleÅ¼y \nwysÅ?aÄ? wiadomoÅ?Ä? uÅ¼ywajÄ?c adresu jednego z nastÄ?pujÄ?cych dostawcÃ³w poczty elektronicznej:\n%s, %s lub %s."
+"%s or %s."
+msgstr "Innym sposobem uzyskania bridges jest wysÅ?anie e-maila do %s. ProszÄ? pamiÄ?taj, Å¼e musisz \nwysÅ?aÄ? e-mail za uzywajÄ?c adresu z jednego z nastÄ?pujÄ?cych dostawcÃ³w usÅ?ugi email:\n%s lub %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -286,54 +300,44 @@ msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "JeÅ?li TwÃ³j Tor nie dziaÅ?a, powinieneÅ? wysÅ?aÄ? wiadomoÅ?Ä? e-mail na adres %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "SprÃ³buj zawrzeÄ? jak najwiecej informacji o swoim problemie, uwzglÄ?dniajÄ?c listÄ? mostÃ³w i Pluggable Transports, ktÃ³rych prÃ³bowaÅ?eÅ? uÅ¼yÄ?, wersjÄ? Tor Browser, wszelkie komunikaty, ktÃ³re zwrÃ³ciÅ? Tor i inne."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Oto Twoje poÅ?Ä?czenia z wykorzystaniem mostÃ³w:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ZdobÄ?dÅº Mosty!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Czy potrzebujesz adresÃ³w IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Czy potrzebujesz %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazÃ³w prawidÅ?owo."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "WprowadÅº tekst z obrazka powyÅ¼ej..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Jak zaczÄ?Ä? uÅ¼ywaÄ? mostÃ³w"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +346,21 @@ msgid ""
 msgstr "Aby wprowadziÄ? mosty do Tor Browser, postÄ?puj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomiÄ? Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Po pojawieniu siÄ? okna 'Ustawienia Sieci Tor' naciÅ?nij przycisk \"Konfiguruj\", a nastÄ?pnie postÄ?puj zgodnie ze\nwskazÃ³wkami kreatora do momentu pytania o:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Czy TwÃ³j dostawca usÅ?ug internetowych (ISP) blokuje lub cenzuruje poÅ?Ä?czenia do sieci Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -364,28 +368,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Wybierz 'Tak' a nastÄ?pnie kliknij 'Dalej'. Aby skonfigurowaÄ? swoje nowe \nmosty, skopiuj i wklej kaÅ¼dy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'PoÅ?Ä?cz' i to wszystko! JeÅ?li napotkasz jakiekolwiek problemy, naciÅ?nij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "WyÅ?wietla tÄ? wiadomoÅ?Ä?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "PoproÅ? o regularne mosty."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "PoproÅ? o mosty IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "PoproÅ? o Pluggable Transport przez TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Uzyskaj kopiÄ? klucza publicznego GnuPG BridgeDB."
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 1ef738569..ee9eb82bb 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Communia <ameaneantie@xxxxxxxxxx>, 2013-2017
 # AndrÃ© Almeida <andrefalmeida@xxxxxxxxxxxxxx>, 2018
 # anominino anomino <anominino@xxxxxxxxxx>, 2018
@@ -25,17 +24,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-02 18:18+0000\n"
-"Last-Translator: Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -47,35 +65,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Algo errado ocorreu com a sua solicitaÃ§Ã£o."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Relatar um Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo Fonte:"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Registro de alteraÃ§Ãµes"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contato"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as suas pontes de conexÃ£o"
 
@@ -83,58 +97,58 @@ msgstr "CÃ³digo QR para as suas pontes de conexÃ£o"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ai, caramba!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que houve um erro ao obter o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©m as suas pontes de conexÃ£o. Escaneie com um leitor de CÃ³digo QR para copiar as pontes de conexÃ£o para dispositivos mÃ³veis e outros aparelhos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente nÃ£o hÃ¡ nenhuma ponte disponÃvel..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Talvez vocÃª deva tentar %s voltar %s e escolher um outro tipo de ponte!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Fazer download do %s Navegador Tor %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
@@ -143,27 +157,27 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%spenas me dÃª pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -171,7 +185,7 @@ msgstr "%sS%sim!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sObter%s Bridges"
@@ -215,7 +229,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
@@ -265,7 +279,7 @@ msgid ""
 "\n"
 msgstr "AlÃ©m disso, BridgeDB tem vÃ¡rias pontes simples %s sem quaisquer Transportadores PlugÃ¡veis %s, o que talvez nÃ£o pareÃ§a tÃ£o legal, mas pode ajudar a driblar a censura na Internet em muitos casos.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
@@ -283,8 +297,8 @@ msgstr "Preciso de um outro modo de obter pontes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lembre que vocÃª deve enviar o e-mail utilizando um endereÃ§o registrado em um dos seguintes provedores de e-mail: \n%s, %s ou %s."
+"%s or %s."
+msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lembre que vocÃª deve enviar o e-mail utilizando um endereÃ§o de um dos seguintes provedores de e-mail: \n%s ou %s. "
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -293,54 +307,44 @@ msgstr "Minhas pontes nÃ£o funcionam!  Preciso de ajuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o Tor nÃ£o funcionar, envie um e-mail %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ãµes possÃveis sobre o seu caso, junto com a lista de \npontes e Transportadores PlugÃ¡veis que vocÃª tentou utilizar, a versÃ£o do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas pontes de conexÃ£o:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Obtenha Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes de tipos de pontes:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "VocÃª precisa de endereÃ§os IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "VocÃª precisa de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Seu navegador nÃ£o estÃ¡ mostrando as imagens corretamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Digite os caracteres da imagem acima..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Como comeÃ§ar a usar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +353,21 @@ msgid ""
 msgstr "Para adicionar pontes ao Navegador Tor, primeiro vÃ¡ ao %s pÃ¡gina de download\ndo Navegador Tor %s e siga as instruÃ§Ãµes  para fazer o download e iniciÃ¡-lo."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Quando a janela 'ConfiguraÃ§Ãµes da Rede Tor' aparecer, clique em 'Configurar' e siga\no assistente atÃ© que ele pergunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "O seu Provedor de ServiÃ§os de Internet (PSI) bloqueia ou censura conexÃµes\nÃ  rede Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -371,28 +375,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecione 'Sim' e clique em 'PrÃ³ximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexÃ£o na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverÃ¡ estar pronto! Caso haja problemas, clique no botÃ£o 'Ajuda' do assistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais suporte."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Mostrar essa mensagem."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Solicitar pontes simples."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Solicitar pontes IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Solicitar um Transportador PlugÃ¡vel por TIPO."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG do BridgeDB."
diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po
index e42ec77a8..89fb1bd13 100644
--- a/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/pt_PT/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A Russo <quisquiliarum2001-habitica@xxxxxxxxxxx>, 2019
 # Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2018
 # Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-08-11 10:53+0000\n"
-"Last-Translator: Nuno Rego <nuno.rego@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Comunicar um Erro"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Registo de alteraÃ§Ãµes"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contactar"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Mostrar CÃ³digo QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "CÃ³digo QR para as suas linhas de ponte"
 
@@ -71,58 +85,58 @@ msgstr "CÃ³digo QR para as suas linhas de ponte"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ocorreu um erro!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Parece que ocorreu um erro ao obter o seu CÃ³digo QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Este CÃ³digo QR contÃ©m as suas linhas de ponte. Digitalize-as com um leitor de CÃ³digo QR para copiar as suas linhas de ponte para os dispositivos mÃ³veis e outros dispositivos."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente, nÃ£o existem pontes disponÃveis..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Talvez devesse experimentar %s e voltar a %s,  escolhendo um tipo de ligaÃ§Ã£o diferente!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Passo %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Transferir %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sisponibilizem-me apenas as pontes!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -159,7 +173,7 @@ msgstr "%sS%sim!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
@@ -203,7 +217,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "Adicionalmente, BridgeDB tem imensas ligaÃ§Ãµes %s simples, normais e regulares,\nsem quaisquer Transportes de LigaÃ§Ã£o %s, o que poderÃ¡ nÃ£o parecer Ã³timo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
@@ -271,8 +285,8 @@ msgstr "Eu preciso de um modo alternativo para obter as pontes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outra forma de obter pontes, Ã© enviar uma mensagem para %s. Por favor, note que\ndeve enviar a mensagem utilizando um endereÃ§o dos seguintes fornecedores de e-mail\n%s, %s ou %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "As minhas pontes nÃ£o funcionam! Eu preciso de ajuda!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor nÃ£o funciona, deve enviar uma mensagem para %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ã£o possÃvel sobre o seu caso, incluindo a lista\nde ligaÃ§Ãµes e Pluggable Transports que tentou utilizar, a versÃ£o do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas linhas de ponte:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes para o tipo de ponte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Precisa de endereÃ§os de IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Precisa de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador nÃ£o estÃ¡ a exibir as imagens devidamente."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Insira os carateres da imagem acima..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Como comeÃ§ar a utilizar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "Para inserir as ligaÃ§Ãµes no Tor Browser, aceda primeiro Ã  pÃ¡gina %s para transferir o Tor Browser %s\ne depois siga as instruÃ§Ãµes sobre com transferir e utilizar o\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Assim que aparecer a janela de 'ConfiguraÃ§Ãµes da Rede Tor' clique em 'Configurar' e siga\nas instruÃ§Ãµes do assistente atÃ© que lhe pergunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "O seu fornecedor de acesso Ã  Internet (ISP) bloqueia ou censura as ligaÃ§Ãµes\nÃ  rede Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas conexÃµes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeverÃ¡ estar pronto para continuar! Se encontrar problemas, tente clicar na 'Ajuda' no\nassistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais assistÃªncia."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Exibe esta mensagem."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Solicite as pontes bÃ¡sicas."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Solicite as pontes de IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Solicite um Transporte de LigaÃ§Ã£o por TIPO."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtenha uma cÃ³pia da chave pÃºblica GnuPG da BridgeDB."
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 3f05a7d4e..afaebe8c0 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # A C <ana@xxxxxxxxxxxx>, 2019
 # Adda.17 <inactive+Adda.17@xxxxxxxxxxxxx>, 2013
 # Adrian Staicu <astaicu@xxxxxxxxx>, 2017
@@ -17,17 +16,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-08 20:34+0000\n"
-"Last-Translator: A C <ana@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -39,35 +57,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Scuze ! Ceva n-a mers cum trebuie!"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "RaporteazÄ? un bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Cod sursÄ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "SchimbÄ?ri"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Selectare totalÄ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "AratÄ? QRcod-ul"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Cod QR pentru punÈ?ile tale"
 
@@ -75,58 +89,58 @@ msgstr "Cod QR pentru punÈ?ile tale"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Oops, ca sÄ? vezi!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Se pare cÄ? s-a produs o eroare Ã®n obÈ?inerea codului QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Codul QR conÈ?ine punÈ?ile tale. ScaneazÄ?-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Pe moment nu existÄ? punÈ?i disponibile..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Poate ar trebui sÄ? %s mergi Ã®napoi %s È?i sÄ? alegi un alt tip de punte!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Pasul %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "DescarcÄ? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Pasul %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ObÈ?ine %s punÈ?i %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pasul %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
@@ -135,27 +149,27 @@ msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "OpÈ?iuni avansate"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nu"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "niciunul/niciuna"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -163,7 +177,7 @@ msgstr "%sD%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbÈ?ine Bridges"
@@ -207,7 +221,7 @@ msgstr "BunÄ? , %s!"
 msgid "Hello, friend!"
 msgstr "BunÄ?, prietene!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chei publice"
 
@@ -257,7 +271,7 @@ msgid ""
 "\n"
 msgstr "Ã?n plus, BridgeDB are multe punÈ?i simple %s fÄ?rÄ? niciun\nTransport Conectabil %s ce poate nu par aÈ?a cool, dar care pot\ntotuÈ?i sÄ? ajute la evitarea cenzurii Internetului Ã®n multe cazuri.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ce sunt punÈ?ile? "
 
@@ -275,8 +289,8 @@ msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "O altÄ? cale pentru a obÈ?ine punÈ?i este sÄ? trimiÈ?i un email cÄ?tre %s. Nu uita cÄ?\ntrebuie sa trimiÈ?i email-ul folosind o adresÄ? de la unul dintre urmÄ?torii furnizori de e-mail:\n%s, %s sau %s."
+"%s or %s."
+msgstr "Alt mod de a obÈ?ine punÈ?ie este sÄ? trimiteÈ?i un email la %s. RemarcaÈ?i cÄ? trebuie sÄ? trimiteÈ?i un email de la unul din urmÄ?torii privederi::\n%s or %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -285,54 +299,44 @@ msgstr "PunÈ?ile mele nu funcÈ?ioneazÄ?! Am nevoie de ajutor!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "DacÄ? Tor nu funcÅ£ioneazÄ? pentru tine, trimite un mesaj la  %s ."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ã?ncercÄ? sÄ? incluzi cÃ¢t mai multe informaÈ?ii despre cazul tÄ?u pe cÃ¢t posibil, include lista de \npunÈ?i È?i Pluggable Transports pe care ai Ã®ncercat sÄ? le foloseÅ?ti, versiunea de navigator Tor Browser\nÈ?i orice alt mesaj dat de Tor, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Acestea sunt liniile tale de punÈ?i:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ObÈ?ine punÈ?i!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Alege opÈ?iunile pentru tipul de punte:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ai nevoie de adrese IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ai nevoie de %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Introdu caracterele din imaginea de mai sus..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Cum sÄ? Ã®ncepi sÄ? foloseÅ?ti punÈ?ile"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +345,21 @@ msgid ""
 msgstr "Pentru a introduce punÈ?i Ã®n Tor Browser, mai Ã®ntÃ¢i mergi la %s pagina de descÄ?rcare Tor Browser\n%s È?i apoi urmeazÄ? instrucÈ?iunile de descÄ?rcare È?i iniÈ?ializare\na Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "CÃ¢nd apare dialogul 'SetÄ?ri reÈ?ea Tor', selecteazÄ? 'Configurare' È?i urmeazÄ? \nindicaÈ?iile programului pÃ¢nÄ? cÃ¢nd va cere:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Furnizorul de servicii de Internet (ISP) Ã®È?i blocheazÄ? sau cenzureazÄ? conexiunile cÄ?tre reÈ?eaua Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -363,28 +367,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "SelecteazÄ? 'Da' È?i apoi alege 'UrmÄ?torul'. Pentru a configura noile punÈ?i, copiazÄ? È?i lipeÈ?te \npunÈ?ile Ã®n cÄ?suÈ?a de text. Ã?n final, selecteazÄ? 'ConecteazÄ?-te' È?i totul e gata! \nDacÄ? ai probleme, apasÄ? butonul 'Ajutor' din 'SetÄ?ri ReÈ?ea Tor'."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "AfiÈ?eazÄ? acest mesaj."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Cere punÈ?i simple."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Cere punÈ?i IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "SolicitÄ? un Transport Conectabil dupÄ? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "ObÈ?ine o copie a cheii GnuPG publice a BridgeDB."
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index c40b69918..1cacedc6f 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Andrey, 2017
 # Andrey Yoker Ogurchikov <domovoy.yoker@xxxxxxxxx>, 2014
 # Ð?Ð½Ñ?Ð¾Ð½ Ð¢Ð¾Ð»Ð¼Ð°Ñ?ÐµÐ² <a.tolmachev@xxxxxxxxxxxxxxxxxx>, 2016
@@ -30,17 +29,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-01 09:18+0000\n"
-"Last-Translator: Dmitry Schneider <adamred280@xxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -52,35 +70,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð§Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ñ? Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ð½Ð°Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð²Ñ?Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²"
 
@@ -88,58 +102,58 @@ msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "ÐÑ?, Ñ?Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ð¿Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ QR-ÐºÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð². Ð?Ñ?Ñ?ÐºÐ°Ð½Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐµÐ³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð¾Ð¼, Ñ?Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸Ð¼ QR-ÐºÐ¾Ð´, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð² Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ðµ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð¸Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ð¾Ð²Ð°Ñ?Ñ? %s Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?%s Ð¸ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð¨Ð°Ð³ %sâ??1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð¹Ñ?Ðµ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð¨Ð°Ð³ %sâ??2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ñ? %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð¨Ð°Ð³ %sâ??3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð?Ð°Ñ?ÐµÐ¼ %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser %s"
@@ -148,27 +162,27 @@ msgstr "Ð?Ð°Ñ?ÐµÐ¼ %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?ÐµÑ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! "
@@ -176,7 +190,7 @@ msgstr "%sÐ?%sÐ°! "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²%s"
@@ -220,7 +234,7 @@ msgstr "ÐÐ¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹, Ð´Ñ?Ñ?Ð³!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸"
 
@@ -270,7 +284,7 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ð»ÐµÐµ Ñ?Ð¾Ð³Ð¾, BridgeDB Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s, Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ð¹ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? %s, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð²Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð° Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°, Ñ?Ð°Ðº-Ð¶Ðµ Ð¾Ð½Ð¸ Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð¾Ð±Ð¾Ð¹Ñ?Ð¸ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð§Ñ?Ð¾ Ñ?Ð°ÐºÐ¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ??"
 
@@ -288,8 +302,8 @@ msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?Ð¾ÐµÐ´Ð¸Ð½Ðµ
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ,  Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²: %s, %s Ð¸Ð»Ð¸ %s."
+"%s or %s."
+msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð° Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° Ñ?Ð¾, Ñ?Ñ?Ð¾ Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? \nÐ¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»ÐµÐ½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²:\n%s Ð¸Ð»Ð¸ %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -298,54 +312,44 @@ msgstr "Ð?ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð¼! Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ñ?Ð»Ð¸ Tor Ð½Ðµ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°ÐµÑ?Ñ?Ñ?, Ð½Ð°Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼ Ð½Ð° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ? %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð?Ð»Ñ? Ð±Ñ?Ñ?Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð²Ð°Ñ?ÐµÐ¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ð² Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ðµ, Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? Ð¸Ð¼Ñ? Ð¼Ð¾Ñ?Ñ?Ð° Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ, ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ðµ Ð²Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð»Ð¸ Ð´Ð»Ñ? Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?, Ð° Ñ?Ð°ÐºÐ¶Ðµ Ð²ÐµÑ?Ñ?Ð¸Ñ? Tor Browser."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð¡Ñ?Ñ?Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð´ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +358,21 @@ msgid ""
 msgstr "Ð§Ñ?Ð¾Ð±Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ð¹ Ð¼Ð¾Ñ?Ñ? Ð² %s Tor Browser, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Tor Browser %s Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ð¿Ð¾ Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ð½Ð¸Ñ? Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÑ? 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor', Ð´Ð°Ð»ÐµÐµ Ð½Ð°Ð¶Ð°Ñ?Ñ? 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?' Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°, Ð¿Ð¾ÐºÐ° Ð²Ñ? Ð½Ðµ Ñ?Ð²Ð¸Ð´Ð¸Ñ?Ðµ Ð²Ð¾Ð¿Ñ?Ð¾Ñ?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -376,28 +380,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ð»ÐµÐµ'. Ð?Ð»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð²Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¸\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²Ð¾Ð´Ð° Ñ?ÐµÐºÑ?Ñ?Ð°. Ð? Ð½Ð°Ð¶Ð¸Ð¼Ð°ÐµÑ?Ðµ 'Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?'! Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼, Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ 'Ð?Ð¾Ð¼Ð¾Ñ?Ñ?'\nÐ²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor' Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ñ?Ð²Ð¾Ð´Ð¸Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¾Ð¹ IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð¿Ð¸Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð¾Ð³Ð¾ GnuPG-ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index 4c9e905b0..e3ee9f9e2 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # elo, 2014
 # FooBar <thewired@xxxxxxxxxx>, 2015
 # Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>, 2019
@@ -14,17 +13,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-10 06:45+0000\n"
-"Last-Translator: Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "PrepÃ¡Ä?te! Pri spracovanÃ vaÅ¡ej poÅ¾iadavky sa vyskytla chyba."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "NahlÃ¡siÅ¥ chybu"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "PoslednÃ© zmeny"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "OznaÄ?iÅ¥ vÅ¡etko"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "ZobraziÅ¥ QR KÃ³d"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR kÃ³d vaÅ¡ich premostenÃ"
 
@@ -72,58 +86,58 @@ msgstr "QR kÃ³d vaÅ¡ich premostenÃ"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Do pekla!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "ZdÃ¡ sa Å¾e nastala chyba pri zÃskavanÃ vÃ¡Å¡ho QR kÃ³du."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Tento QR kÃ³d obsahuje vaÅ¡e prehostenia. MoÅ¾ete ho zoskenovaÅ¥ Ä?ÃtaÄ?kou QR kÃ³dov, ktorou ich skopÃrujete do mobilu Ä?i inÃ½ch zariadenÃ"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "PrÃ¡ve niesÃº dostupnÃ© Å¾iadne premostenia..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MoÅ¾no by ste mohli skÃºsiÅ¥ %s ÃsÅ¥ spÃ¤Å¥ %s a vybraÅ¥ si inÃ½ typ premostenia."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Krok %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "StiahnuÅ¥ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskajte %s premostenia %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
@@ -132,27 +146,27 @@ msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sen mi zobrazte premostenia!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "PokroÄ?ilÃ© moÅ¾nosti"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Å¾iadne"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÃ?%sno!"
@@ -160,7 +174,7 @@ msgstr "%sÃ?%sno!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastaviÅ¥ Bridges"
@@ -204,7 +218,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Ahoj, priateÄ¾!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
 
@@ -254,7 +268,7 @@ msgid ""
 "\n"
 msgstr "DodatoÄ?ne, BridgeDB mÃ¡ dosÅ¥ pÃ´vodnych premostenÃ %s bez Å¾iadnych Pluggable Transports %s ktorÃ© moÅ¾no niesu aÅ¾ takÃ© cool, ale vo veÄ¾a prÃpadoch stÃ¡le dokÃ¡Å¾u obÃsÅ¥ cenzÃºrovanie internetu.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ä?o sÃº to premostenia?"
 
@@ -272,8 +286,8 @@ msgstr "Potrebujem inÃ½ spÃ´sob ako zÃskaÅ¥ premostenia!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "DalÅ¡Ãm spÃ´sobom ako zÃskaÅ¥ premostenia je poslaÅ¥ mail na %s. \nEmail vÅ¡ak musÃte poslaÅ¥ pomocou adresy od jednÃ©ho z tÃ½chto poskytovateÄ¾ov:\n%s, %s alebo %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "Moje premostenia nefungujÃº! Potrebujem pomoc!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ak vÃ¡Å¡ Tor nefunguje, skÃºste napÃsaÅ¥ email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "SkÃºste napÃsaÅ¥ Ä?o najviac informaciÃ o vaÅ¡om prÃpade, vrÃ¡tane zoznamu premostenÃ a Pluggable Transportov ktorÃ© ste skÃºÅ¡ali pouÅ¾iÅ¥, verzia Tor Browseru, a hlÃ¡Å¡ky ktorÃ© Tor vypÃsal, apod."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ZÃskaÅ¥ premostenia!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "ProsÃm vyberte si moÅ¾nosti na typ premostenia:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 adresy?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prehliadaÄ? nezobrazuje obrÃ¡zky sprÃ¡vne."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "VloÅ¾te znaky z obrÃ¡zku vyÅ¡Å¡ie..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ako zaÄ?aÅ¥ pouÅ¾ÃvaÅ¥ vaÅ¡e premostenia"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
 msgstr "Na zadanie premostenÃ do Tor Browsera, najprv choÄ?te na download strÃ¡nku %s %s Tor Browsera a riaÄ?te sa inÅ¡trukiacmi na stiahnutie a zapnutie Tor Browsera."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "KeÄ? vyskoÄ?ia 'Tor SieÅ¥ovÃ© Nastavenia', kliknite na 'KonfigurovaÅ¥' a pokraÄ?ujte Ä?alej kÃ½m sa vÃ¡Å¡ insÅ¥alÃ¡tor nespÃ½ta:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokuje alebo nejak cenzuruje vÃ¡Å¡ PoskytovateÄ¾ Internetu (ISP) pripojenia k Sieti Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -360,28 +364,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "OznaÄ?te 'Ã?no' a potom kliknite na 'Ä?alej'.  Na konfigurÃ¡ciu novÃ½ch premostenÃ, skopÃrujte premostenia do polÃÄ?ka na text. Potom kliknite na 'PripojiÅ¥' a uÅ¾ by to malo fungovaÅ¥. Ak mÃ¡te nejakÃ© problemy, kliknite na tlaÄ?idlo 'Pomoc' v 'Tor sieÅ¥ovÃ½ch nastaveniach' pre viac informaciÃ. "
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "ZobrazÃ tÃºto sprÃ¡vu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "PoÅ¾iadaÅ¥ o pÃ´vodnÃ© premostenia."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "PoÅ¾iadaÅ¥ o IPv6 premostenia."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "PoÅ¾iadaÅ¥ o Pluggable Transport podla typu."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Stiahnite si kÃ³piu verejnÃ©ho klÃºÄ?a GNUPG  pre BridgeDB."
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
index 14b972fd4..fedc3aebc 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Lovro Drofenik <lovro.drofenik@xxxxx>, 2018
 # Rok Kepa <rokkepa@xxxxxxxxx>, 2019
 # RokX, 2016
@@ -12,17 +11,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-16 06:52+0000\n"
-"Last-Translator: Rok Kepa <rokkepa@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! Z vaÅ¡o zahtevo je bilo nekaj narobe."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Prijavi napako"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Izvorna koda"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Novosti"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Stik"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Vse"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "PrikaÅ¾i QR kodo"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR koda za mostovne povezave"
 
@@ -70,58 +84,58 @@ msgstr "QR koda za mostovne povezave"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, Å¡pageti :)"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Napak pri izdelavi QR kode"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR koda vsebuje mostovne povezave. Slikaj kodo za kopiranje mostovnih povezav na mobilne in druge naprave."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno ni na voljo mostovnih povezav..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "MogoÄ?e je bolje, Ä?e %s greÅ¡ nazaj %s in izbereÅ¡ drugo vrsto mosta."
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Korak %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Poberi %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dobi %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
@@ -130,27 +144,27 @@ msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo dodaj mostove!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Napredno"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "niÄ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -158,7 +172,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sobi mostove"
@@ -202,7 +216,7 @@ msgstr "Oj, %s!"
 msgid "Hello, friend!"
 msgstr "Pozdravljen!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni kljuÄ?"
 
@@ -252,7 +266,7 @@ msgid ""
 "\n"
 msgstr "Dodatno, BridgeDB ima mnogo nezanimih mostiÄ?kov %s brez kakrÅ¡njihkoli\ntransportnih vtiÄ?nikov %s ki morda ne zvenijo dobro, vendar Å¡e vedno\npomagajo pri preslepitvi internetne cenzure v mnogih primerih\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Kaj so mostovi?"
 
@@ -270,8 +284,8 @@ msgstr "Potrebujem drug naÄ?in za priti do mosta!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Drug naÄ?in za zbiranje mostiÄ?kov je preko naÅ¡e e-poÅ¡te %s. Zapomnite si, da morate poslati e-pismo z uporabo naslova naslednjih e-poÅ¡tnih ponudnikov\n%s, %s ali %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Moji mostovi ne delujejo! Potrebujem pomoÄ?!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ä?e vaÅ¡ Tor brskalnik ne deluje, poÅ¡ljite elektronsko poÅ¡to na naslov %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Poskusite vkljuÄ?iti Ä?im veÄ? informacij o vaÅ¡em primeru,\nvkljuÄ?no s seznamom\nmostiÄ?kov in transportnih vtiÄ?nikov, ki ste jih uporabili, verzijo Tor iskalnik\nin vsa sporoÄ?ila, ki vam jih je dal Tor, itd."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Tu so vrstice mostiÄ?kov:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Pridobite si mostiÄ?ke!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Izberite tip mostiÄ?ka:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 naslove?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ brskalnik ne prikazuje slik pravilno."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Vnesite znake vsebovane v zgornji sliki..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Kako zaÄ?eti uporabljati svoje mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
 msgstr "Da vstavite mostove v brskalnik Tor, pojdite najprej na %s stran za naloÅ¾itev brskalnika Tor %s in sledite navodilom za naloÅ¾itev in zagon brskalnika Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ko se 'Nastavitve Tor omreÅ¾ja' okence pojavi, kliknite 'Nastavi' in sledite navodilom Ä?arovnika, dokler ne vpraÅ¡a:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ali vaÅ¡ ponudnik internetnih storitev (ISP) blokira ali kako drugaÄ?e cenzurira povezave na Tor omreÅ¾je?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -358,28 +362,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Izberite 'Da' in nato kliknite 'Naprej'. Za nastavitev vaÅ¡ih novih mostov, kopirajte in prilepite povezave mostov v prostor za vnos besedila. Zdaj pritisnite 'PoveÅ¾i' in moralo bi delovati! Ä?e se pojavijo problemi poskusite klikniti tipko 'PomoÄ?' v Ä?arovniku za 'Nastavitve Tor omreÅ¾ja' za nadaljnjo pomoÄ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "PrikaÅ¾i to sporoÄ?ilo."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Zahteva za vanilla mostiÄ?ke."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Zaprosi za IPv6 mostove."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Zahtevjte transportne vtiÄ?nike po tipu."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Pridobite kopijo javnega GnuPG kljuÄ?a za BridgeDB."
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
index 02cfc76ff..c71986efe 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Bujar Tafili, 2015
 # Mirela Pacani <milela00@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-15 12:20+0000\n"
-"Last-Translator: Besnik <besnik@xxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "KÃ«rkojmÃ« ndjesÃ«! DiÃ§ka shkoi keq me kÃ«rkesÃ«n tuaj."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Raportoni njÃ« gabim"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kodi Burimor"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Regjistri i ndryshimeve"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "PÃ«rzgjidhini tÃ« Gjitha"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Tregoni Kodin QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "Kodi QR pÃ«rlinjat e urave tuaja"
 
@@ -68,58 +82,58 @@ msgstr "Kodi QR pÃ«rlinjat e urave tuaja"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ã?farÃ« tersi!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Duket se u has njÃ« gabim, duke marrÃ« Kodin tuaj QR."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ky Kod QR pÃ«rmban linja urash. Skanojeni me njÃ« lexues Kodi QR, qÃ« t'i kopjoni linjat e urave tuaja nÃ« celular, apo nÃ« pajisje tÃ« tjera."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "KÃ«tÃ« Ã§ast s'ka asnjÃ« urÃ« tÃ« disponueshme..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Ndoshta duhet tÃ« provoni tÃ« %s shkoni prapa %s dhe tÃ« zgjidhni njÃ« lloj tÃ« ndryshÃ«m ure!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Hapi %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Shkarkoni %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Hapi %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Merrni %s ura %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Hapi %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tani %s shtojini urat tek Tor Browser %s"
@@ -128,27 +142,27 @@ msgstr "Tani %s shtojini urat tek Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sÃ« jepni urat!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Opsionet e PÃ«rparuara"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Jo"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "asnjÃ«"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sP%so!"
@@ -156,7 +170,7 @@ msgstr "%sP%so!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sM%serrni Urat"
@@ -200,7 +214,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "PÃ«rshÃ«ndetje mik!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "KyÃ§a PublikÃ«"
 
@@ -250,7 +264,7 @@ msgid ""
 "\n"
 msgstr "PÃ«rveÃ§ kÃ«saj, BridgeDB ka shumÃ« ura %s tÃ« bezdisshme, pa ndonjÃ«\nPluggable Transports %s, Ã§ka ndoshta nuk do tÃ« tingÃ«llojÃ« mirÃ«, por ata ende\nmund tÃ« ndihmojnÃ« qÃ« ta anashkaloni censurÃ«n e internetit nÃ« shumÃ« raste.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ã?'janÃ« urat?"
 
@@ -268,8 +282,8 @@ msgstr "MÃ« nevojitet njÃ« mÃ«nyrÃ« alternative pÃ«r pÃ«rftimin e urave!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "NjÃ« mÃ«nyrÃ« tjetÃ«r pÃ«r tÃ« pÃ«rftuar ura Ã«shtÃ« tÃ« dÃ«rgoni njÃ« e-postÃ« tek %s. ju lutemi vini re se ju duhet\nta dÃ«rgoni e-postÃ«n, duke pÃ«rdorur njÃ« adresÃ« nga njÃ«ri prej ofruesve tÃ« e-postÃ«s nÃ« vijim:\n%s, %s ose %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "Urat e mia nuk punojnÃ«! MÃ« duhet ndihmÃ«!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "NÃ«se Tor i juaj nuk punon, ju duhet t'i dÃ«rgoni e-postÃ« %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PÃ«rpiquni tÃ« pÃ«rfshini sa mÃ« shumÃ« informacion qÃ« tÃ« mundeni rreth rastit tuaj, duke vendosur edhe listÃ«n e\nurave dhe Pluggable Transports qÃ« provuat tÃ« pÃ«rdorni, versionin tuaj tÃ« Tor Browser,\nsi dhe Ã§do mesazh qÃ« ka dhÃ«nÃ« Tor, etj."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "KÃ«tu janÃ« linjat e urave tuaja:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Merrni Ura!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ju lutemi pÃ«rzgjidhni mundÃ«sitÃ« pÃ«r llojin e urÃ«s:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "A ju nevojiten adresat IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "A ju nevojitet njÃ« %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Futini karakteret nga imazhi mÃ« sipÃ«r..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Si tÃ« nisni t'i pÃ«rdorni urat tuaja"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
 msgstr "PÃ«r t'i futur urat nÃ« Tor Browser, sÃ« pari shkoni tek %s faqja e shkarkimit \ntÃ« Tor Browser %s dhe mÃ« pas ndiqini instruksionet aty, qÃ« ta shkarkoni dhe nisni \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Kur dialogu i \"Konfigurimit tÃ« Rrjetit Tor\" tÃ« kÃ«rcejÃ«, klikoni \"Konfiguroni\" dhe ndiqni\nasistentin derisa ta kÃ«rkojÃ« ai:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "A i pengon apo i censuron Ofruesi juaj i ShÃ«rbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -356,28 +360,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "PÃ«rzgjidhni \"Po\" dhe mÃ« pas klikoni \"Tjetri\". QÃ« tÃ« konfiguroni urat tuaja tÃ« reja, kopjojini dhe\nngjitini linjat e urave nÃ« kutinÃ« e futjes sÃ« tekstit. MÃ« nÃ« fund, klikoni \"Lidhuni\", dhe\ndo tÃ« jeni gati pÃ«r t'ia nisur! NÃ«se do tÃ« pÃ«rjetoni probleme, pÃ«rpiquni tÃ« klikoni butonin \"NdihmÃ«\" \ntek asistenti i \"Konfigurimit tÃ« Rrjetit Tor\", pÃ«r mÃ« shumÃ« mbÃ«shtetje."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Shfaq kÃ«tÃ« mesazh."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "KÃ«rkoni urat vanilje ose non-Pluggable Transport."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "KÃ«rkoni urat IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "KÃ«rkoni njÃ« Pluggable Transport nÃ«pÃ«rmjet TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Merrni njÃ« kopje tÃ« kyÃ§it publik GnuPG tÃ« BridgeDB."
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index cf9b486c5..cb237f5ea 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Aleksa RistiÄ?, 2019
 # an lykin <lykin@xxxxxxxxxxxxxx>, 2018
 # Pseudoscops, 2018
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-07-10 11:07+0000\n"
-"Last-Translator: Aleksa RistiÄ?\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?Ð¾Ð³Ð¾Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð¸Ð·Ð¼ÐµÐ½Ð°"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð²Ðµ"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
@@ -74,58 +88,58 @@ msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð£Ñ?, Ñ?Ñ?Ñ?Ð°Ñ?Ð½Ð¾!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¾ Ð´Ð¾ Ð³Ñ?ÐµÑ?ÐºÐµ Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ QR kÐ¾Ð´Ð°."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "QR ÐºÐ¾Ð´ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð³Ð° Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¸Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ðµ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ %s Ð´Ð° Ñ?Ðµ Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¼Ð¸Ñ?Ðµ %s Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ? %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ?%s"
@@ -134,27 +148,27 @@ msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð½ÐµÐ¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ¾!"
@@ -162,7 +176,7 @@ msgstr "%sÐ¢%sÐ¾!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
@@ -206,7 +220,7 @@ msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ñ?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ?ÐµÐ²Ð¸"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "Ð?Ð¾Ñ?ÐµÐ´ Ñ?Ð¾Ð³Ð°, BridgeDB Ð¸Ð¼Ð° Ð¿Ñ?Ð½Ð¾ Ð½Ð°Ñ?Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° %s Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¸Ñ?\nÐ¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð° %s Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ Ñ?Ð¾Ð»Ð¸ÐºÐ¾ ÐºÑ?Ð», Ð°Ð»Ð¸ Ð¾Ð½Ð¸ Ð¸Ð¿Ð°Ðº\nÑ? Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ²Ð° Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð¾Ð±Ð¸Ñ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð° Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸?"
 
@@ -274,8 +288,8 @@ msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð¼Ð¸ Ñ?Ðµ Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð·Ð° Ð´Ð¾
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð?Ð¾Ñ? Ñ?ÐµÐ´Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¸-Ð¼ÐµÑ?Ð» Ð½Ð° %s. Ð£Ð·Ð¼Ð¸Ñ?Ðµ Ñ? Ð¾Ð±Ð·Ð¸Ñ? Ð´Ð°\nÐ¼Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¸-Ð¼ÐµÑ?Ð» ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¾Ð´ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¸-Ð¼ÐµÑ?Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð°.\n%s, %s Ð¸Ð»Ð¸ %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Ð?Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ð½Ðµ Ñ?Ð°Ð´Ðµ! Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð¼Ð¸ 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ð?Ð°Ñ? Ð¢Ð¾Ñ? Ð½Ðµ Ñ?Ð°Ð´Ð¸, Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?Ñ? %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¾ Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð° Ð¾ Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð° Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ð¸Ð²Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, \nÐ²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ Ñ?Ð¾Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð°, Ð±Ð¸Ð»Ð¾ \nÐºÐ¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ñ?Ñ? Ð²Ð°Ð¼ Ñ?Ðµ Ð¢Ð¾Ñ? Ð¸Ð·Ð±Ð°Ñ?Ð¸Ð¾, Ð¸Ñ?Ð´."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ?, Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ñ? Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ IPv6 Ð°Ð´Ñ?ÐµÑ?Ðµ?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð?Ð°Ð¼ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð½Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÐµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ Ñ?Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð·Ð½Ð°Ð´..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? Tor, Ð¿Ñ?Ð²Ð¸ Ð¸Ð´Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð¸ %s Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ %s \nÐ¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¸ Ñ?Ð°Ð¼Ð¾ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³ 'Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ðµ' Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¸' Ð¸ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð´Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (Ð?Ð¡Ð?) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ'. Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ñ?Ð²Ð¾Ñ?Ðµ Ð½Ð¾Ð²Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ½Ð°Ð»ÐµÐ¿Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ðµ Ð·Ð° Ñ?Ð½Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°. Ð?Ð¾Ð½Ð°Ñ?Ð½Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'ÐºÐ¾Ð½ÐµÐºÑ?Ñ?Ñ? Ñ?Ðµ', i\nÐ¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ! Ð?ÐºÐ¾ Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¸Ð¼Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÑ? Ñ?Ð°Ñ?Ð¾Ð±Ñ?Ð°ÐºÐ· Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ Ð¢Ð¾Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° Ð±Ð°Ð·Ð¸Ñ?Ð½Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° IPv6 Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ±Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð¿Ð¾ Ð¢Ð?Ð?Ð£."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? ÐºÑ?Ñ?Ñ?Ð° BridgeDB Ñ?Ð°Ð²Ð½Ð¾Ð³ GnuPG."
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index a5c01551c..a95fecfaf 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Anders Jensen-Urstad <anders@xxxxxxx>, 2014
 # Emil Johansson <emil.a.johansson@xxxxxxxxx>, 2015
 # Gabor Sebastiani, 2014
@@ -20,17 +19,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-01 08:49+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -42,35 +60,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "NÃ¥got gick tyvÃ¤rr fel med din fÃ¶rfrÃ¥gan."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Rapportera ett fel"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "KÃ¤llkod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ã?ndringslogg"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Markera allt"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Visa QR-kod"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-kod fÃ¶r dina brorader"
 
@@ -78,58 +92,58 @@ msgstr "QR-kod fÃ¶r dina brorader"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Bomber och granater, nÃ¥got gick snett!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Det verkar som att ett fel orsakade problem att fÃ¥ din QR-kod."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Denna QR-kod innehÃ¥ller dina rader med broar. Skanna den med en QR-kodlÃ¤sare fÃ¶r att kopiera dina rader med broar till mobila och andra enheter."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "FÃ¶r nÃ¤rvarande finns inga broar tillgÃ¤ngliga..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Prova att %s gÃ¥ tillbaka %s fÃ¶r att vÃ¤lja en annan typ av bro!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Steg %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "HÃ¤mta %s Tor Browser  %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Skaffa %s broar %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
@@ -138,27 +152,27 @@ msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sara ge mig broar!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Avancerade instÃ¤llningar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "inget"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -166,7 +180,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sÃ¤mta broar"
@@ -210,7 +224,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Hej, kompis!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
@@ -260,7 +274,7 @@ msgid ""
 "\n"
 msgstr "Dessutom har BridgeDB nÃ¥gra alldeles vanliga broar %s utan Pluggable\nTransports %s vilket kanske inte lÃ¥ter sÃ¥ hÃ¤ftigt, men i mÃ¥nga fall kan de \nfortfarande hjÃ¤lpa dig med att kringgÃ¥ internet-censur.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Vad Ã¤r broar?"
 
@@ -278,8 +292,8 @@ msgstr "Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa broar pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ett annat sÃ¤tt att fÃ¥ nya broar Ã¤r att skicka e-post till %s. Du mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande e-postleverantÃ¶rer:\n%s, %s eller %s."
+"%s or %s."
+msgstr "Ett annat sÃ¤tt att fÃ¥ nya bryggor Ã¤r att skicka e-post till %s. Du mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande epostleverantÃ¶rer:\n%s eller %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -288,54 +302,44 @@ msgstr "Mina broar fungerar inte! Jag behÃ¶ver hjÃ¤lp!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor inte fungerar fÃ¶r dig sÃ¥ kan du e-posta %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "FÃ¶rsÃ¶k att berÃ¤tta sÃ¥ mycket om problemet som du kan, bland annat vilka\nbroar och Pluggable Transports som du fÃ¶rsÃ¶kt anvÃ¤nda, vilken version av Tor Browser du anvÃ¤nder, vilka felmeddelanden som Tor visat, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "HÃ¤r Ã¤r dina rader med broar:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Skaffa broar!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "VÃ¤lj alternativ fÃ¶r typ av bro:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "BehÃ¶ver du en IPv6-adress?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BehÃ¶ver du %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Din webblÃ¤sare visar inte bilder korrekt."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Skriv in tecknen frÃ¥n bilden ovan..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Hur du bÃ¶rjar anvÃ¤nda dina broar"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +348,21 @@ msgid ""
 msgstr "FÃ¶r att ange broar i Tor Browser, gÃ¥ till %s hÃ¤mtningssidan fÃ¶r Tor Browser %s och fÃ¶lj instruktionerna fÃ¶r att hÃ¤mta och starta Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¤r dialogen \"NÃ¤tverksinstÃ¤llningar fÃ¶r Tor\" visas, vÃ¤lj \"Konfigurera\" och fÃ¶lj\nstegen tills du kommer till frÃ¥gan:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blockerar eller filtrerar din InternetleverantÃ¶r (ISP) anslutningar till Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -366,28 +370,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "VÃ¤lj 'Ja' och klicka sedan pÃ¥ 'NÃ¤sta'. FÃ¶r att konfigurera nya broar, kopiera och klistra in broraderna i textrutan. Klicka slutligen pÃ¥ 'Anslut' och det borde vara klart fÃ¶r anvÃ¤ndning! Om du fÃ¥r problem, prova att klicka pÃ¥ 'HjÃ¤lp'-knappen i 'Tor Network Settings' fÃ¶r vidare hjÃ¤lp."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Visa detta meddelande."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Leta efter vanliga broar."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "BegÃ¤r IPv6-broar"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Leta efter en Pluggable Transport av en viss TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "HÃ¤mta en kopia av BridgeDB:s publika GnuPG-nyckel."
diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po
index aaf722a3d..567b70ff0 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Zaituni Njovu <zaituni@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: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-21 13:55+0000\n"
-"Last-Translator: Zaituni Njovu <zaituni@xxxxxxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: sw\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Samahani!  Kitufulani kimekwenda vibaya pamoja na ombi lako."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ripoti Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Chanzo msimbo"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Badili log"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Mawasiliano"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Chagua zote"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Onyesha QR msimbo"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR msimbo kwa mistari ya daraja"
 
@@ -67,58 +81,58 @@ msgstr "QR msimbo kwa mistari ya daraja"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Inaonekana kuna kosa katika kupata QR msimbo wako."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Msimbo huu wa QR unanayo mistari ya daraja lako.  Scan msimbo wa QR msomaji kutoa nakala ya daraja lako kwa simu na vifaa vingine."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Huko sasa hakuna madaraja yoyote yanayopatikana..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Labda ujaribu 1%s kurudi 1%s  na uchague aina tofauti ya daraja!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Hatua 1%s 1 1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Pakua 1%s Kivinjari cha Tor 1%s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Pata 1%s madaraja 1%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Hatua 1%s 3 1%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
@@ -127,27 +141,27 @@ msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "1%s J 1%s ust nipe mimi daraja!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "chaguo la juu"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "hapana"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Hakuna"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "1%s Y 1%s  es!"
@@ -155,7 +169,7 @@ msgstr "1%s Y 1%s  es!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "1%s G 1%s et Madaraja"
@@ -199,7 +213,7 @@ msgstr "Wewe, 1%s !"
 msgid "Hello, friend!"
 msgstr "Hujamboa, rafiki!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ufunguo za umma"
 
@@ -249,7 +263,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ni nini madaraja?"
 
@@ -267,7 +281,7 @@ msgstr "Nahitaji njia nyingine ya kupata madaraja mbadala!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kama Tor yako haifanyi kazi, tuma email tafadhali 1 %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Jaaribu kujumuisha taarifa zaidi kuhusu kesi yako kama unajumuisha orodha ya madaraja na pluggable usafiri uliojaribu kutumia,  toleo la kivinjari chako cha Tor na ujumbe wowote ambao Tor waliutoa, nk."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hapa ni mistari ya daraja lako:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Pata madaraja!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Unahitaji  anuani za IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Unahitaji 1%s ?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Kivinjari chako hakionyeshi picha vizuri."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ingiza maneno kutoka kwenye picha juu..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Jinsi ya kuanza kutumia madaraja yako"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
 msgstr "Ili kuingia madaraja kwenye  1%s Kivinjari cha Tor, kwanza nenda kwenye pakua ya Kivinjari cha Tor 1%s  ukurasa na kisha kufuata maelekezo huko kwa kupakua na kuanzia Kivinjari cha Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Wakati mpangilio wa mtandao wa Tor mazungumzo yakitokea,  gusa mpagilio tena na fuata wizard hadi ikuulize:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Imtoa huduma ya Mtandao wako (ISP) zuia au vinginevyo  hisi muunganiko kwenye mtandao wa Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -355,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Onyesha picha hii."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ombi Vanilla madaraja."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ombi IPv6 madaraja."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ombi la Pluggable Usafiri na Aina."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Pata nakala ya daraja DB ufunguo wa umma  GnuPG."
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
index 417207fc0..4fc9bd67c 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Anto Sujesh <sujeshantoj@xxxxxxxxx>, 2015
 # deadrat <jayabharat@xxxxxxxx>, 2017
 # Ephraim Raj <ephraimraj11299@xxxxxxxxx>, 2016
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à®®à®©à¯?à®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?! à®?à®?à¯?à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®?à¯?à®³à®¿à®±à¯?à®?à¯? à®?à®¤à¯?à®?à®°à¯?  à®¤à®µà®±à¯? à®¨à¯?à®°à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à®?à®°à¯? à®ªà®¿à®´à¯?à®¯à¯? à®?à®±à®¿à®?à¯?à®?à¯?à®?à¯?à®¯à¯?à®?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à®®à¯?à®² à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à®®à®¾à®±à¯?à®±à®®à¯?à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¾à®ªà¯?à®ªà¯?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®³à¯?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à®?à®©à¯?à®¤à¯?à®¤à¯?à®¯à¯?à®®à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®¾à®£à¯?à®ªà®¿ "
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®¯ bridge à®µà®°à®¿à®?à®³à¯?à®?à¯?à®?à®¾à®© QRCode"
 
@@ -71,58 +85,58 @@ msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®¯ bridge à®µà®°à®¿à®?à®³à¯?à®?à¯?à®?à®¾à®© QRC
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr " à®?à®¯à®?à¯?, à®ªà®¿à®°à®?à¯?à®?à®©à¯?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à®?à®¨à¯?à®¤ QRCode à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³à®¤à¯?. à®?à¯?à®²à¯?à®²à®¿à®?à®ªà¯?à®?à®¿ à®®à®±à¯?à®±à¯?à®®à¯? à®µà¯?à®±à¯? à®?à®¾à®¤à®©à®?à¯?à®?à®³à®¿à®²à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®¨à®¿à®°à®²à¯?à®?à¯?à®?à¯?à®? QRCode à®µà®¾à®?à®¿à®ªà¯?à®ªà®¾à®©à¯? à®®à¯?à®²à®®à¯? à®?à®¤à¯? à®?à®?à¯?à®±à¯?à®µà®¿ à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à®¤à®±à¯?à®?à®®à®¯à®®à¯? Bridge-à®?à®³à¯? à®¯à¯?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à®?à®°à¯?à®µà¯?à®³à¯? à®¨à¯?à®?à¯?à®?à®³à¯? %s à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®? à®ªà®¿à®©à¯?à®©à¯? à®?à¯?à®©à¯?à®±à¯? %s à®µà¯?à®±à¯?à®°à¯? à®µà®?à¯? à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?à®¯à®²à®¾à®®à¯?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à®?à®?à®¿ %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®µà¯?à®®à¯? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à®?à®?à®¿ %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Bridge-à®?à®³à¯? %s à®ªà¯?à®±à¯?à®?"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à®?à®?à®¿ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
@@ -131,27 +145,27 @@ msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà®¨à¯?%sà®°à®¯à®?à®¿à®¯à®¾à®? bridge-à®?à®³à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à®®à¯?à®®à¯?à®ªà®?à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à®?à®²à¯?à®²à¯?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à®?à®¤à¯?à®µà¯?à®®à®¿à®²à¯?à®²à¯?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà®?%sà®®à¯?!"
@@ -159,7 +173,7 @@ msgstr "%sà®?%sà®®à¯?!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sà®ªà¯?%sà®°à¯?à®? Bridge-à®?à®³à¯?"
@@ -203,7 +217,7 @@ msgstr "à®¹à¯?, %s!"
 msgid "Hello, friend!"
 msgstr "à®¹à®²à¯?à®¾, à®¤à¯?à®´à®¾!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à®ªà¯?à®¾à®¤à¯? à®?à®¾à®µà®¿à®?à®³à¯?"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "à®?à¯?à®?à¯?à®¤à®²à®¾à®?, BridgeDB-à®¯à®¿à®©à¯?à®³à¯? à®?à®°à®¾à®³à®®à®¾à®© à®ªà®´à¯?à®¯à®®à¯?à®±à¯? bridge-à®?à®³à¯? \n%s Pluggable Transports à®µà®?à®¤à®¿à®¯à®¿à®²à¯?à®²à®¾à®®à®²à¯? à®?à®³à¯?à®³à®¤à¯? %s à®?à®£à®°à¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®?à¯?à®?à®¿à®±à®µà®¾à®±à¯? à®?à®²à¯?à®²à®¾à®µà®¿à®?à¯?à®?à®¾à®²à¯?à®®à¯?, \nà®?à®µà¯?à®¯à®¾à®²à¯? à®ªà®² à®?à®¨à¯?à®¤à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à®¿à®²à¯? à®?à®©à¯?à®¯ à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à¯? à®?à®?à®?à¯?à®? à®?à®¤à®µà¯?à®®à¯?.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Bridges à®?à®©à¯?à®±à®¾à®²à¯? à®?à®©à¯?à®©?"
 
@@ -271,8 +285,8 @@ msgstr "à®?à®©à®?à¯?à®?à¯? Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®°à¯? à®®à®¾à®±à¯?à®±à¯?à®µà®´à®¿ %s à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯?   à®?à®°à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯?.\nà®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¯à®¤à¯? à®?à®µà®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à®?à¯?à®?à®¾à®¯à®®à®¾à®? à®?à¯?à®´à¯?à®?à®£à¯?à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®µà¯?à®?à®³à®¿à®©à¯? à®®à¯?à®?à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯? :\n%s, %s or %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "à®?à®©à¯? Bridge-à®?à®³à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "à®?à®?à¯?à®?à®³à¯? Tor à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯? à®?à®©à®¿à®²à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? %s à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à¯?à®³à¯?à®?  "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "à®?à®?à¯?à®?à®³à¯? à®µà®´à®?à¯?à®?à¯? à®?à¯?à®±à®¿à®¤à¯?à®¤à¯? à®?à®¤à®¿à®?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à®³à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®³à¯?, à®?à®¤à®¿à®²à¯? à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®¯à®±à¯?à®?à®¿à®¤à¯?à®¤ bridges\nà®®à®±à¯?à®±à¯?à®®à¯? Pluggable Transports, à®¤à®?à¯?à®?à®³à®¿à®©à¯? Tor Browser à®ªà®¤à®¿à®ªà¯?à®ªà¯? à®?à®£à¯? à®?à®?à®¿à®¯à®µà¯? à®?à®?à®?à¯?à®?à¯?à®®à¯?, à®®à®±à¯?à®±à¯?à®®à¯? Tor\nà®?à¯?à®°à®¿à®¯à®¤à®?à®µà®²à¯?à®?à®³à¯? à®ªà¯?à®¾à®©à¯?à®±à®µà®±à¯?à®±à¯?à®¯à¯?à®®à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à¯?à®?à®³à¯?: "
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®?!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Bridge à®µà®?à¯? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? IPv6 à®®à¯?à®?à®µà®°à®¿à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®®à®¾?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®°à¯? %s à®¤à¯?à®µà¯?à®¯à®¾?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr " à®¤à®?à¯?à®?à®³à®¿à®©à¯? browser à®ªà®?à®?à¯?à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®? à®?à®¾à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "à®®à¯?à®²à¯? à®?à®³à¯?à®³ à®ªà®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®°à¯?à®?à¯?à®?à¯?à®®à¯? à®?à®´à¯?à®¤à¯?à®¤à¯?à®?à¯?à®?à®³à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à®¤à®?à¯?à®?à®³à®¿à®©à¯? bridge-à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®¤à¯?à®¾à®?à®?à¯?à®?à¯?à®µà®¤à¯? à®?à®ªà¯?à®ªà®?à®¿"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "Tor à®?à®²à®¾à®µà®¿à®¯à®¿à®²à¯? bridgeà®?à®³à¯? à®?à®³à¯?à®³à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯, à®®à¯?à®¤à®²à®¿à®²à¯? %s Tor à®?à®²à®¾à®µà®¿ à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à¯? à®?à¯?à®©à¯?à®±à¯? %s à®®à¯?à®²à¯?à®®à¯? à®ªà®¿à®±à®?à¯? à®?à®?à¯?à®?à¯? Tor à®?à®²à®¾à®µà®¿à®¯à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®¤à¯?à®?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®?à®±à®¿à®µà¯?à®±à¯?à®¤à¯?à®¤à®²à¯?à®?à®³à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à¯?à®?à¯?à®?à®³à¯?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' à®?à®°à¯?à®¯à®¾à®?à®²à¯? à®®à¯?à®²à¯?à®¤à¯?à®¾à®©à¯?à®±à¯?à®®à¯? à®ªà¯?à®´à¯?à®¤à¯?, 'à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯?à®?à¯?à®¯à¯?à®¤à¯? \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®?à®¤à¯? à®?à¯?à®?à¯?à®?à¯?à®®à¯?à®µà®°à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à®µà¯?à®®à¯?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à®?à®?à¯?à®?à®³à®¿à®©à¯? à®?à®£à¯?à®¯ à®?à¯?à®µà¯? à®µà®´à®?à¯?à®?à¯?à®®à¯? (ISP) à®¨à®¿à®±à¯?à®µà®©à®®à¯? Tor à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®¤à®?à¯?à®?à¯?à®?à®¿à®±à®¤à®¾ à®?à®²à¯?à®²à®¤à¯? \nà®µà¯?à®±à¯?à®µà®´à®¿à®¯à®¿à®²à¯? à®¤à®£à®¿à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à®¾? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à®?à®®à¯?' à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®¤à¯?à®¤à¯? à®ªà®¿à®©à¯?à®©à®°à¯? 'à®?à®?à¯?à®¤à¯?à®¤à¯?' à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®¤à®?à¯?à®?à®³à®¿à®©à¯? à®ªà¯?à®¤à®¿à®¯ bridge-à®?à®³à¯? à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?, \nà®µà®°à®¿à®?à¯?à®?à®³à¯? à®µà®¾à®?à¯?à®?à®¿à®¯à®®à¯? à®?à®³à¯?à®³à¯?tà®?à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¨à®?à®²à¯?à®?à®?à¯?à®¤à¯?à®¤à¯?  à®ªà¯?à®¸à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®?à®±à¯?à®¤à®¿à®¯à®¾à®?, 'à®?à®£à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯? \nà®?à¯?à®¯à¯?à®¤à®µà¯?à®?à®©à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à¯?à®²à¯?à®² à®¤à®¯à®¾à®°à¯?! à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¿à®°à®?à¯?à®?à®¿à®©à¯?à®¯à¯? à®?à®¨à¯?à®¤à®¿à®¤à¯?à®¤à®¾à®²à¯?, 'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ 'à®?à®¤à®µà®¿' à®ªà¯?à®¾à®¤à¯?à®¤à®¾à®©à¯?  à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®²à¯?à®®à¯? à®?à®¤à®µà®¿ à®ªà¯?à®±à®µà¯?à®®à¯?."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®¾à®?à¯?à®?à®µà¯?à®®à¯? "
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "à®ªà®´à¯?à®¯à®®à¯?à®±à¯?à®¯à®¾à®© bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Pluggable Transport bridge-à®?à®³à¯? TYPE à®µà®?à¯?à®¯à®¿à®²à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr " BridgeDB-à®¯à¯?à®?à¯?à®¯ à®ªà¯?à®¾à®¤à¯? GnuPG à®?à®¾à®µà®¿à®¯à®¿à®©à¯? à®?à®°à¯? à®¨à®?à®²à¯? à®ªà¯?à®±à®µà¯?à®®à¯?."
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 252adf612..9e591db37 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -1,24 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # runasand <inactive+runasand@xxxxxxxxxxxxx>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 09:41+0000\n"
-"Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -30,35 +49,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Source Code"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Changelog"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Select All"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Show QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode for your bridge lines"
 
@@ -66,58 +81,58 @@ msgstr "QRCode for your bridge lines"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "It seems there was an error getting your QRCode."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "There currently aren't any bridges available..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Step %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Download %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Step %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Get %s bridges %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Step %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Now %s add the bridges to Tor Browser %s"
@@ -126,27 +141,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "No"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -154,7 +169,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
@@ -198,7 +213,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -248,7 +263,7 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
@@ -266,8 +281,8 @@ msgstr "I need an alternative way of getting bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
+"%s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -276,54 +291,44 @@ msgstr "My bridges don't work! I need help!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr "If your Tor cannot connect, please take a look at the %s and our %s."
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -332,21 +337,21 @@ msgid ""
 msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -354,28 +359,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Displays this message."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Request a Pluggable Transport by TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index a4c88a1a0..7d3b13346 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # bact' <arthit@xxxxxxxxx>, 2017
 # bact' <arthit@xxxxxxxxx>, 2017
 # BlackDog ForThai <myblackdog@xxxxxxx>, 2015
@@ -19,17 +18,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-07-03 05:55+0000\n"
-"Last-Translator: DN DN <deen6@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¸?à¸à¸à¸ à¸±à¸¢! à¸¡à¸µà¸à¸°à¹?à¸£à¸?à¸´à¸?à¸?à¸?à¸?à¸´à¹?à¸?à¸´à¸?à¸?à¸¶à¹?à¸?à¸?à¸±à¸?à¸?à¸³à¸?à¸à¸?à¸à¸?à¸?à¸¸à¸?"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "à¹?à¸?à¹?à¸?à¸?à¸±à¹?à¸?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "à¸?à¸à¸£à¹?à¸ªà¹?à¸?à¹?à¸?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "à¸ªà¸¡à¸¸à¸?à¸?à¸±à¸?à¸?à¸¶à¸?à¸ªà¸´à¹?à¸?à¸?à¸à¸?à¹?à¸«à¸¡à¹?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "à¸?à¸¹à¹?à¸?à¸´à¸?à¸?à¹?à¸"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¹?à¸?à¸«à¸¡à¸?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "à¹?à¸ªà¸?à¸?à¸£à¸«à¸±à¸ª QR"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "à¸£à¸«à¸±à¸ª QR à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?"
 
@@ -77,58 +91,58 @@ msgstr "à¸£à¸«à¸±à¸ª QR à¸ªà¸³à¸«à¸£à¸±à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "à¸à¹?à¸²à¸§ à¸¢à¸¸à¹?à¸?à¹?à¸¥à¹?à¸§à¹?à¸?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "à¹?à¸«à¸¡à¸·à¸à¸?à¸?à¸°à¸¡à¸µà¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸£à¸°à¸«à¸§à¹?à¸²à¸?à¸£à¸±à¸?à¸£à¸«à¸±à¸ª QR à¸?à¸à¸?à¸?à¸¸à¸?"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "à¸£à¸«à¸±à¸ª QR à¸?à¸µà¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¥à¸?à¸ºà¸ªà¹?à¸?à¹?à¸²à¸? à¸ªà¹?à¸?à¸?à¸?à¹?à¸§à¸¢à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸à¹?à¸²à¸?à¸£à¸«à¸±à¸ª QR à¹?à¸?à¸·à¹?à¸à¸?à¸µà¹?à¸?à¸°à¸?à¸³à¸ªà¸³à¹?à¸?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¥à¸?à¸ºà¸ªà¹?à¸?à¹?à¸²à¸? à¹?à¸?à¸?à¸¶à¸?à¹?à¸¡à¸?à¸²à¸¢à¹?à¸¥à¸°à¹?à¸?à¸£à¸·à¹?à¸à¸?à¸à¸·à¹?à¸?à¹?"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "à¸?à¸±à¸?à¸?à¸¸à¸?à¸±à¸?à¸?à¸µà¹?à¹?à¸¡à¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸µà¹?à¹?à¸?à¹?à¹?à¸?à¹?"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "à¸?à¹?à¸²à¸?à¸?à¸§à¸£à¸?à¸°à¸¥à¸à¸?à¸?à¸¹ %s à¸?à¸¥à¸±à¸? %s à¹?à¸¥à¸·à¸à¸?à¸?à¸£à¸°à¹?à¸ à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¡à¹?à¹?à¸«à¸¡à¸·à¸à¸?à¹?à¸?à¸´à¸¡à¸à¸²à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¹?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "à¸¥à¸³à¸?à¸±à¸?%s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸? %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "à¸¥à¸³à¸?à¸±à¸?%s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¹?à¸à¸² %s à¸?à¸£à¸´à¸?à¸?à¹? à¸¡à¸² %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¸¥à¸³à¸?à¸±à¸?%s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¸?à¸à¸?à¸?à¸µà¹? %s à¹?à¸?à¸´à¹?à¸¡à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸? Tor Browser %s"
@@ -137,27 +151,27 @@ msgstr "à¸?à¸à¸?à¸?à¸µà¹? %s à¹?à¸?à¸´à¹?à¸¡à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¹?à¸?à¸ªà¸¹à¸?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "à¹?à¸¡à¹?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "à¹?à¸?à¸¥à¹?à¸²"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¹?à¸?à¹?%s"
@@ -165,7 +179,7 @@ msgstr "%sà¹?à¸?à¹?%s"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¸ºà¸¡à¸²"
@@ -209,7 +223,7 @@ msgstr "à¹?à¸®à¹?!, %s!"
 msgid "Hello, friend!"
 msgstr "à¸ªà¸§à¸±à¸ªà¸?à¸µà¹?à¸?à¸·à¹?à¸à¸?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¸?à¸¸à¸?à¹?à¸?à¸ªà¸²à¸?à¸²à¸£à¸?à¸°"
 
@@ -259,7 +273,7 @@ msgid ""
 "\n"
 msgstr "à¸¢à¸´à¹?à¸?à¸?à¸§à¹?à¸²à¸?à¸±à¹?à¸? BridgeDB à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¸ºà¸¡à¸²à¸?à¸£à¸?à¸²à¸? %s à¹?à¸?à¸¢à¹?à¸¡à¹?à¸¡à¸µ\nPluggable Transports %s\nà¸?à¸µà¹?à¸?à¹?à¸§à¸¢à¸«à¸¥à¸µà¸?à¹?à¸¥à¸µà¹?à¸¢à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¸ªà¸?à¸²à¸?à¸?à¸²à¸£à¸?à¹?à¸ªà¹?à¸§à¸?à¸¡à¸²à¸?\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸·à¸à¸à¸°à¹?à¸£?"
 
@@ -277,8 +291,8 @@ msgstr "à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸²à¸?à¹?à¸¥à¸·à¸à¸?à¹?à¸?à¸·à¹?à¸à¹?à¸?à¹?à¸?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "à¸à¸µà¸?à¸§à¸´à¸?à¸µà¸£à¸±à¸?à¸?à¸£à¸´à¸?à¸?à¸ºà¸«à¸?à¸¶à¹?à¸?à¸?à¸·à¸à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥à¹?à¸«à¹? %s à¹?à¸?à¸£à¸?à¹?à¸?à¹?à¸²à¹?à¸?à¸§à¹?à¸²à¸?à¸¸à¸?à¸?à¹?à¸à¸?\nà¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥à¸?à¹?à¸§à¸¢à¸à¸µà¹?à¸¡à¸¥à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸²à¸£à¸à¸µà¹?à¸¡à¸¥à¸?à¸¶à¹?à¸?à¸?à¸²à¸¡à¸¡à¸²:\n%s %s à¸«à¸£à¸·à¸ %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¡à¹?à¸?à¸³à¸?à¸²à¸? à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸§
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr " à¸?à¹?à¸² Tor à¸?à¸à¸?à¸?à¹?à¸²à¸?à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸³à¸?à¸²à¸?à¹?à¸?à¹?à¸?à¸£à¸¸à¸?à¸²à¸ªà¹?à¸?à¸à¸µà¹?à¸¡à¸¥ %s à¹?à¸«à¹?à¸?à¸£à¸²à¸?"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
 msgid "Here are your bridge lines:"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¸?à¸µà¹?à¸?à¸µà¹?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "à¸£à¸±à¸?à¸?à¸£à¸´à¸?à¸?à¹?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "à¸?à¸£à¸¸à¸?à¸²à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸?à¸´à¸?à¸?à¸à¸?à¸?à¸£à¸´à¸?à¸?à¹?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸µà¹?à¸à¸¢à¸¹à¹? IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "à¸?à¸£à¸²à¸§à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸ªà¸?à¸?à¸?à¸¥à¸à¸¢à¹?à¸²à¸?à¸?à¸µà¹?à¸?à¸§à¸£"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "à¸?à¸´à¸¡à¸?à¹?à¸?à¸±à¸§à¸à¸±à¸?à¸©à¸£à¸?à¸²à¸?à¸ à¸²à¸?à¸?à¹?à¸²à¸?à¸?à¸?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¹?à¸à¸¢à¹?à¸²à¸?à¹?à¸£"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
 msgstr "à¸?à¹?à¸à¸?à¸?à¸°à¹?à¸?à¹?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸? Tor Browser, à¸?à¹?à¸à¸?à¸à¸·à¹?à¸?à¹?à¸?à¸?à¸µà¹? %s à¸«à¸?à¹?à¸² Tor Browser à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?\nà¹?à¸¥à¸°à¸?à¸³à¸?à¸²à¸¡à¸?à¸±à¹?à¸?à¸?à¸à¸?à¹?à¸?à¸·à¹?à¸à¹?à¸£à¸´à¹?à¸¡à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?à¹?à¸¥à¸°à¹?à¸£à¸´à¹?à¸¡ Tor Browser"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "à¸«à¸²à¸? pops up 'Tor Network Settings' à¹?à¸ªà¸?à¸?à¸?à¸¶à¹?à¸?à¸¡à¸², à¹?à¸«à¹?à¸?à¸¥à¸´à¸? 'Configure' à¹?à¸¥à¸°à¸?à¸³à¸?à¸²à¸¡à¸?à¸±à¹?à¸?à¸?à¸à¸?à¹?à¸? wizard"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à¸?à¸¹à¹?à¹?à¸«à¹?à¸?à¸£à¸´à¸?à¸²à¸£à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?à¸¸à¸? (ISP) à¹?à¸?à¹?à¸?à¸¥à¹?à¸à¸? à¸«à¸£à¸·à¸à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢ Tor à¸«à¸£à¸·à¸à¹?à¸¡à¹?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -365,28 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "à¹?à¸¥à¸·à¸à¸? 'à¹?à¸?à¹?' à¹?à¸¥à¸°à¸?à¸? 'à¸?à¹?à¸à¹?à¸?' à¹?à¸?à¸·à¹?à¸à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?, à¸ªà¸³à¹?à¸?à¸² à¹?à¸¥à¸°\nà¸§à¸²à¸? à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹? à¹?à¸?à¸?à¸¥à¹?à¸à¸?à¸?à¹?à¸à¸?à¸§à¸²à¸¡. à¸ªà¸¸à¸?à¸?à¹?à¸²à¸¢, à¸?à¸? 'à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸', à¹?à¸¥à¸°\nà¸?à¸¸à¸?à¸?à¸§à¸£à¸?à¸°à¹?à¸?à¹?à¸?à¹?à¸?à¸µ! à¸«à¸²à¸?à¸?à¸¸à¸?à¸?à¸´à¸?à¸?à¸±à¸?à¸«à¸², à¹?à¸«à¹?à¸¥à¸à¸?à¸?à¸?à¸?à¸¸à¹?à¸¡ 'à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸'\nà¹?à¸?à¸«à¸?à¹?à¸² 'Tor Network Settings' wizard à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸§à¸²à¸¡à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "à¹?à¸ªà¸?à¸?à¸?à¹?à¸à¸?à¸§à¸²à¸¡à¸?à¸µà¹?"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "à¸?à¸à¸£à¹?à¸à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸¡à¸²à¸?à¸£à¸?à¸²à¸?"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "à¸£à¹?à¸à¸?à¸?à¸ IPv6 à¸?à¸£à¸´à¸?à¸?à¹?"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "à¸ªà¹?à¸?à¸?à¸³à¸£à¹?à¸à¸? Pluggable Transport à¹?à¸?à¸¢à¹?à¸ªà¹?à¸?à¸³à¸§à¹?à¸² TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "à¸£à¸±à¸?à¸ªà¸³à¹?à¸?à¸²à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¸ªà¸²à¸?à¸²à¸£à¸?à¸° BridgeDB's  GnuPG"
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index a1f17cbf0..ba98d98bd 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Bullgeschichte <bullgeschichte@xxxxxxxxxx>, 2015
 # eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
 # Emir SarÄ± <bitigchi@xxxxxxxxxxxxxxx>, 2014
@@ -27,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-09 02:36+0000\n"
-"Last-Translator: Kaya Zeren <kayazeren@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?zgÃ¼nÃ¼z! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Bir Hata Bildirin"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kaynak Kodu"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "SÃ¼rÃ¼m NotlarÄ±"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ä°letiÅ?im"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "TÃ¼mÃ¼nÃ¼ SeÃ§"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Kodunu GÃ¶rÃ¼ntÃ¼le"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
 
@@ -85,58 +99,58 @@ msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Haydi hayÄ±rlÄ±sÄ±!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR Kodunuzun alÄ±nmasÄ±nda bir sorun Ã§Ä±kmÄ±Å? gibi gÃ¶rÃ¼nÃ¼yor."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Bu QR Kodunda kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z bulunuyor. KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ± bir mobil aygÄ±ta ya da baÅ?ka aygÄ±tlara kopyalamak iÃ§in bu kodu bir QR Kodu tarayÄ±cÄ±sÄ±na okutun."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Å?u anda kullanÄ±labilecek bir kÃ¶prÃ¼ yok..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Belki %s geri dÃ¶nmeyi %s ve farklÄ± bir kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§meyi denemelisiniz!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "%s Tor Browser UygulamasÄ±nÄ± %s indirin"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶prÃ¼leri %s edinin"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s. AdÄ±m"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
@@ -145,27 +159,27 @@ msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sana sadece kÃ¶prÃ¼leri verin!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "GeliÅ?miÅ? Ayarlar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "HayÄ±r"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "hiÃ§biri"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sE%svet!"
@@ -173,7 +187,7 @@ msgstr "%sE%svet!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶prÃ¼leri Al"
@@ -217,7 +231,7 @@ msgstr "Selam, %s!"
 msgid "Hello, friend!"
 msgstr "Selam, arkadaÅ?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Herkese AÃ§Ä±k Anahtarlar"
 
@@ -267,7 +281,7 @@ msgid ""
 "\n"
 msgstr "AyrÄ±ca BridgeDB %s Ã¼zerinde herhangi bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± kullanmayan %s birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz vanilla kÃ¶prÃ¼sÃ¼ bulunur. KulaÄ?a pek iyi gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Ä°nternet engellemelerini aÅ?makta yardÄ±mcÄ± olabilir.\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "KÃ¶prÃ¼ nedir?"
 
@@ -285,8 +299,8 @@ msgstr "KÃ¶prÃ¼leri edinmek iÃ§in baÅ?ka bir yola gerek duyuyorum!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "KÃ¶prÃ¼leri edinmenin diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±larÄ±n birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s, %s ya da %s."
+"%s or %s."
+msgstr "KÃ¶prÃ¼leri almanÄ±n diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±lardan birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s veya %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "KÃ¶prÃ¼lerim Ã§alÄ±Å?mÄ±yor! YardÄ±m gerek!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor uygulamanÄ±z Ã§alÄ±Å?mÄ±yorsa %s adresine e-posta gÃ¶ndermelisiniz."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkÄ±nda olabildiÄ?ince fazla bilgi verin.\nKullanmaya Ã§alÄ±Å?tÄ±Ä?Ä±nÄ±z kÃ¶prÃ¼ listesi ve DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar, Tor Browser sÃ¼rÃ¼mÃ¼nÃ¼z,\nTor tarafÄ±ndan gÃ¶rÃ¼ntÃ¼lenen tÃ¼m iletiler gibi."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ä°Å?te kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "KÃ¶prÃ¼leri Al!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfen kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§eneklerini belirleyin:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 adresleri gerekli mi?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s gerekli mi?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "TarayÄ±cÄ±nÄ±z gÃ¶rselleri dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lemiyor."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "YukarÄ±daki gÃ¶rselde bulunan karakterleri yazÄ±n..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "KÃ¶prÃ¼lerinizi nasÄ±l kullanabilirsiniz"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,21 @@ msgid ""
 msgstr "Tor Browser Ã¼zerine kÃ¶prÃ¼ler eklemek iÃ§in\n%s Tor Browser indirme sayfasÄ±na %s\ngidin ve Tor Browser indirme ve baÅ?latma yÃ¶nergelerini izleyin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "'Tor AÄ?Ä± AyarlarÄ±' penceresi aÃ§Ä±ldÄ±Ä?Ä±nda, 'Ayarla' Ã¼zerine tÄ±klayÄ±n ve Å?u soru soruluncaya\ndek yardÄ±mcÄ±yÄ± izleyin:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ä°nternet Hizmeti SaÄ?layÄ±cÄ±nÄ±z (ISS) Tor aÄ?Ä±na olan baÄ?lantÄ±larÄ± engelliyor\nya da baÅ?ka Å?ekillerde bir sansÃ¼r uyguluyor mu?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -373,28 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Evet' seÃ§ip ardÄ±ndan 'Ä°leri' Ã¼zerine tÄ±klayÄ±n. Yeni kÃ¶prÃ¼lerinizi ayarlamak iÃ§in kÃ¶prÃ¼\nsatÄ±rlarÄ±nÄ± kopyalayarak metin kutusuna yapÄ±Å?tÄ±rÄ±n.\n'BaÄ?lan' Ã¼zerine tÄ±kladÄ±Ä?Ä±nÄ±zda artÄ±k hazÄ±rsÄ±nÄ±z! Sorun yaÅ?Ä±yorsanÄ±z, daha fazla yardÄ±m almak iÃ§in 'Tor AÄ?Ä± AyarlarÄ±' yardÄ±mcÄ±sÄ±ndaki 'YardÄ±m' dÃ¼Ä?mesine tÄ±klamayÄ± deneyin."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Bu iletiyi gÃ¶rÃ¼ntÃ¼ler."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Normal kÃ¶prÃ¼ler iste."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶prÃ¼leri iste."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± iste."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Herkese aÃ§Ä±k BridgeDB GnuPG anahtarÄ±nÄ±n bir kopyasÄ±nÄ± al."
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 3f0f11a91..30d93a0a2 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>, 2019
 # Eugene ghostishev, 2014
 # LinuxChata, 2014-2015
@@ -16,17 +15,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-04-05 23:58+0000\n"
-"Last-Translator: Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð¸ Ð¿Ñ?Ð¸Ð½Ð¾Ñ?Ð¸Ð¼Ð¾ Ð½Ð°Ñ?Ñ? Ð²Ð¸Ð±Ð°Ñ?ÐµÐ½Ð½Ñ?! Ð©Ð¾Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð· Ð?Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ð¸Ñ?Ð¾Ð¼."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ð?Ð¾Ð´"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Ð?Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ð²Ñ?Ñ?"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ð¸ QR-ÐºÐ¾Ð´"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð²"
 
@@ -74,58 +88,58 @@ msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð²"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Ð?Ñ?Ð°ÐºÐ¾Ñ?!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "Ð?Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?Ð¾ Ñ?Ñ?Ð°Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ QR-ÐºÐ¾Ð´Ñ?."
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð². Ð?Ñ?Ð´Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ð¹Ð¾Ð³Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?Ð¼ Ð´Ð»Ñ? Ð·Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? QR-ÐºÐ¾Ð´Ñ?Ð², Ñ?Ð¾Ð± Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð² Ð½Ð° Ð¼Ð¾Ð±Ñ?Ð»Ñ?Ð½Ñ? Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?."
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "Ð?Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð?Ð°Ð¼ Ñ?Ð»Ñ?Ð´ Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ñ?Ð¸ %s Ð¿Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ð¸Ñ?Ñ? %s Ñ? Ð²Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð½Ñ?Ð¸Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ñ?!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ %s Tor Browser %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ð¸ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
@@ -134,27 +148,27 @@ msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ð?Ñ?"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ð¶Ð¾Ð´ÐµÐ½"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -162,7 +176,7 @@ msgstr "%sÐ¢%sÐ°Ðº!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸"
@@ -206,7 +220,7 @@ msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð´Ñ?Ñ?Ð¶Ðµ!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ? ÐºÐ»Ñ?Ñ?Ñ?"
 
@@ -256,7 +270,7 @@ msgid ""
 "\n"
 msgstr "Ð?Ñ?Ñ?Ð¼ Ñ?Ð¾Ð³Ð¾, BridgeDB Ð¼Ð°Ñ? Ð±Ð°Ð³Ð°Ñ?Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¸Ñ? Ñ?Ðº Ð´Ð²ÐµÑ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² %s Ð±ÐµÐ·\nÐ²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð² %s, Ñ?ÐºÑ?, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð³Ð°Ñ?Ð½Ð¾, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ \nÐ¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ? Ð² Ð±Ð°Ð³Ð°Ñ?Ñ?Ð¾Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÐ°Ñ?.\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ð©Ð¾ Ñ?Ð°ÐºÐµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ??"
 
@@ -274,8 +288,8 @@ msgstr "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ð¸Ð¹ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? %s. Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ð¾\nÐ?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð²\nÐ¿Ð¾Ñ?Ð»Ñ?Ð³ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸:\n%s, %s Ð°Ð±Ð¾ %s."
+"%s or %s."
+msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? %s. Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ð¾\nÐ?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð²\nÐ¿Ð¾Ñ?Ð»Ñ?Ð³ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸:\n%s Ð°Ð±Ð¾ %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Ð?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ?!"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð¯ÐºÑ?Ð¾ Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð°Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð° %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐºÐ½Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ?Ðµ Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ Ð?Ð°Ñ? Ð²Ð¸Ð¿Ð°Ð´Ð¾Ðº, Ð² Ñ?Ð¾Ð¼Ñ? Ñ?Ð¸Ñ?Ð»Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº\nÐ¼Ð¾Ñ?Ñ?Ñ?Ð² Ñ? Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð², Ñ?ÐºÑ? Ð?Ð¸ Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ð»Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸, Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor,\nÑ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?, Ñ?ÐºÑ? Tor Ð²Ð¸Ð´Ð°Ð²Ð°Ð², Ñ? Ñ?.Ð´."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð?Ð°Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ IPv6?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸ ..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð°Ñ?Ð¸Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ?Ð°Ð¼Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
 msgstr "Ð©Ð¾Ð± Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Tor Browser, Ñ?Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ? Ñ?Ð´Ñ?Ñ?Ñ? Ð½Ð°  %s Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÑ? Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Tor Browser %s Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ñ?Ð»Ñ?Ð´Ñ?Ð¹Ñ?Ðµ Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð¼ Ð´Ð»Ñ? Ñ?ÐºÐ°Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ?  Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð¾Ð»Ð¸ Ð´Ñ?Ð°Ð»Ð¾Ð³ \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor\" Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ?Ñ?Ñ?Ñ?, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸\" Ñ? Ð´Ð¾Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹Ñ?ÐµÑ?Ñ?\nÐ¿Ñ?Ð´ÐºÐ°Ð·ÐºÐ°Ð¼ Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð°, Ð´Ð¾Ð¿Ð¾ÐºÐ¸ Ð²Ñ?Ð½ Ð½Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¹ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ð°Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?\nÐ´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -362,28 +366,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? \"Ð¢Ð°Ðº\", Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ñ?\". Ð?Ð»Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¸Ñ? bridges, Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ðµ Ð»Ñ?Ð½Ñ?Ñ? bridge Ñ? Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?. Ð?Ð¾Ñ?Ñ?Ð¼, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?', Ñ?\nÐ²Ñ?Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸! Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ \"Ð?Ð¾Ð²Ñ?Ð´ÐºÐ°\" \nÐ² Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð¾Ð²Ñ? \"Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Tor' Ð´Ð»Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ð?Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? vanilla bridges."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Pluggable Transport Ð¿Ð¾ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ ÐºÐ¾Ð¿Ñ?Ñ? Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° Ð´Ð»Ñ? BridgeDB."
diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index 2e7f8277e..28c40993e 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Ali Kamran <kamran@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: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-09-14 08:46+0000\n"
-"Last-Translator: Ali Kamran <kamran@xxxxxxxxxxxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Ù?Ø³Ø¦Ù?Û? Ø±Ù¾Ù?Ø±Ù¹ Ú©Ø±Û?Úº"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Ø³Ù?Ø±Ø³ Ú©Ù?Ú?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Ù?Ø§Ú¯ ØªØ¨Ø¯Û?Ù? Ú©Ø±Û?Úº"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ø±Ø§Ø¨Ø·Û?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "ØªÙ?Ø§Ù? Ù?Ù?ØªØ®Ø¨ Ú©Ø±Û?Úº."
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Ú©Ù?Ú? Ø¸Ø§Û?Ø± Ú©Ø±Û?ÚºÛ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr ""
 
@@ -68,58 +82,58 @@ msgstr ""
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -128,27 +142,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ù?Ø²Û?Ø¯ Ø§Ù?ØªØ®Ø§Ø¨Ø§ØªÛ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "Ù?Û?Û?Úº"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "Ú©Ù?Ø¦Û? Ù?Û?Û?Úº"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -156,7 +170,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -200,7 +214,7 @@ msgstr "Û?Û?Ù?Ù? Ø? %s"
 msgid "Hello, friend!"
 msgstr "Û?Û?Ù?Ù? Ø¯Ù?Ø³ØªÙ?!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ø¹Ù?Ø§Ù?Û? Ú?Ø§Ø¨Û?"
 
@@ -250,7 +264,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr ""
 
@@ -268,7 +282,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -278,54 +292,44 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ú©Û?Ø§ Ø§Ù?Ù¾ Ú©Ù? Ø§Û?Ú© %s Ú?Ø§Ø¦Û?Û? Ø?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -356,28 +360,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "Ø§Ø³ Ù¾Û?ØºØ§Ù? Ú©Ù? Ø¯Ú©Ú¾Ø§ØªØ§ Û?Û?Û?"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index 8f5036df6..25bdca2cd 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Akmal <uzbadmin@xxxxxxxxx>, 2018
 # Shuhrat Dehkanov <k+transifex@xxxxxxx>, 2014
 # U A <u.almasov@xxxxxxxxx>, 2013
@@ -11,17 +10,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-12-01 11:54+0000\n"
-"Last-Translator: Akmal <uzbadmin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Uzr, nimadir xato ketdi."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Nosozlik haqida xabar berish"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kod"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "OÊ»zgarishlar"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "BogÊ»lanish"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Barchasini belgilash"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR kodni koÊ»rsatish"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr ""
 
@@ -69,58 +83,58 @@ msgstr ""
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Voy savil!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR kod olinmadi"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "%s1%s-bosqich"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr " %s Tor brauzeri %sni yuklab olish"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "%s2%s-bosqich"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s-qadam"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -129,27 +143,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "Ilg'or moslamalar"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "YoÊ»q"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "yoÊ»q"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sH%sa!"
@@ -157,7 +171,7 @@ msgstr "%sH%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -201,7 +215,7 @@ msgstr "Salom, %s!"
 msgid "Hello, friend!"
 msgstr "Salom, do'st!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ommaviy kalitlar"
 
@@ -251,7 +265,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Ko'priklar nima?"
 
@@ -269,7 +283,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
 msgstr ""
 
 #: bridgedb/strings.py:115
@@ -279,54 +293,44 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -357,28 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 3402b9c7a..1b8f82b64 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Acooldude, 2016
 # Khanh Nguyen <nguyenduykhanh85@xxxxxxxxx>, 2015-2016
 # Gary, 2016
@@ -13,17 +12,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-07-19 14:23+0000\n"
-"Last-Translator: Ngo Long <ngotienlong1996@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Xin lá»?i! CÃ³ gÃ¬ Ä?Ã³ khÃ´ng Ä?Ãºng vá»?i yÃªu cáº§u cá»§a báº¡n."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "BÃ¡o cÃ¡o lá»?i"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "MaÌ? NguÃ´Ì?n"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Nháºt kÃ½ thay Ä?Ã´Ì?i"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "LiÃªn hÃªÌ£"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Chá»?n Táº¥t cáº£"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "HiÃªÌ?n 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"
 
@@ -71,58 +85,58 @@ msgstr "MaÌ? QR cho caÌ?c Ä?Æ°á»?ng cáº§u ná»?i cuÌ?a baÌ£n"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "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: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 "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:131
 msgid "There currently aren't any bridges available..."
 msgstr "Hiá»?n khÃ´ng cÃ³ sáºµn cáº§u ná»?i nÃ o..."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "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:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ChoÌ£n %sbridges%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "BÆ°Æ¡Ì?c %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "BÃ¢y giÆ¡Ì? thiÌ? %s thÃªm bridges Ä?oÌ? vaÌ?o Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "BÃ¢y giÆ¡Ì? thiÌ? %s thÃªm bridges Ä?oÌ? vaÌ?o Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%shiÌ? cÃ¢Ì?n Ä?Æ°a cho tÃ´i bridges!"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 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:86
 msgid "No"
 msgstr "KhÃ´ng"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "rÃ´Ì?ng"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sV%sÃ¢ng!"
@@ -159,7 +173,7 @@ msgstr "%sV%sÃ¢ng!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sL%sÃ¢Ì?y Bridges"
@@ -203,7 +217,7 @@ msgstr "NaÌ?y, %s!"
 msgid "Hello, friend!"
 msgstr "ChÃ o báº¡n!"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "KhÃ³a cÃ´ng khai"
 
@@ -253,7 +267,7 @@ msgid ""
 "\n"
 msgstr "ThÃªm 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"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "Bridges laÌ? giÌ??"
 
@@ -271,8 +285,8 @@ msgstr "TÃ´i cÃ¢Ì?n mÃ´Ì£t caÌ?ch khaÌ?c Ä?ÃªÌ? lÃ¢Ì?y bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "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."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "Bridges 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Cá»? gáº¯ng cung cáº¥p cÃ ng nhiá»?u thÃ´ng tin vá»? trÆ°á»?ng há»£p cá»§a báº¡n náº¿u cÃ³ thá»?,\nbao gá»?m danh sÃ¡ch nhá»¯ng bridges 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..."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Bridge lines cuÌ?a baÌ£n Ä?Ã¢y:"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "LÃ¢Ì?y Bridges!"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho bridge type:"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 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:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BaÌ£n coÌ? cÃ¢Ì?n mÃ´Ì£t %s?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 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."
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 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:137
 msgid "How to start using your bridges"
 msgstr "LaÌ?m sao Ä?ÃªÌ? bÄ?Ì?t Ä?Ã¢Ì?u sÆ°Ì? duÌ£ng bridges cuÌ?a baÌ£n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
 msgstr "Ä?ÃªÌ? nhÃ¢Ì£p bridges vaÌ?o Tor Browser, Ä?Ã¢Ì?u tiÃªn Ä?i Ä?ÃªÌ?n %s trang taÌ?i xuÃ´Ì?ng cuÌ?a\nTor Browser %s vaÌ? sau Ä?oÌ? laÌ?m theo hÆ°Æ¡Ì?ng dÃ¢Ì?n Æ¡Ì? Ä?oÌ? Ä?ÃªÌ? taÌ?i xuÃ´Ì?ng vaÌ? bÄ?Ì?t Ä?Ã¢Ì?u\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Khi hÃ´Ì£p 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:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "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?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -359,28 +363,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "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
+#: bridgedb/strings.py:160
 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
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "YÃªu cÃ¢Ì?u bridges nguyÃªn gÃ´Ì?c."
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "YÃªu cÃ¢Ì?u bridges cho IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "YÃªu cáº§u má»?t Pluggable Transport by TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Láº¥y mÃ´Ì£t baÌ?n sao cá»§a chiÌ?a khÃ³a GnuPG cÃ´ng cá»?ng cuÌ?a BridgeDB."
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 33ebf4db1..458c8317e 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # khi, 2013
 # khi, 2013
 # khi, 2013
@@ -20,17 +19,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-05-30 00:43+0000\n"
-"Last-Translator: ff98sha\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -42,35 +60,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "æ?¥å??æ¼?æ´?"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "æº?ä»£ç ?"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "æ?´æ?¹æ?¥å¿?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è??ç³»æ?¹å¼?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é??æ?©å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "æ?¾ç¤ºäº?ç»´ç ?"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ç½?æ¡¥äº?ç»´ç ?"
 
@@ -78,58 +92,58 @@ msgstr "ç½?æ¡¥äº?ç»´ç ?"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "å??å??ï¼?"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "è?·å??äº?ç»´ç ?æ?¶å?ºé??ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "äº?ç»´ç ?å??å?«ç½?æ¡¥ä¿¡æ?¯ã??å?©ç?¨äº?ç»´ç ?æ?«æ??ç¨?åº?ï¼?å?¯å°?ç?¸åº?ç??ç½?æ¡¥ä¿¡æ?¯å¤?å?¶å?°æ??æ?ºæ??å?¶ä»?è®¾å¤?ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "è¯?è¯? %sè¿?å??%så?°å??ä¸?é¡µé?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "ç¬¬ %s 1 %s æ¥"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è½½ %s Tor æµ?è§?å?¨ %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "ç¬¬ %s 2 %s æ¥"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "è?·å?? %s ç½?æ¡¥ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "ç¬¬ %s 3 %s æ¥"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
@@ -138,27 +152,27 @@ msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "é«?çº§é??é¡¹"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "æ? "
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "æ?¯(%sY%s)ï¼?"
@@ -166,7 +180,7 @@ msgstr "æ?¯(%sY%s)ï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "è?·å??ç½?æ¡¥(%sG%s)"
@@ -210,7 +224,7 @@ msgstr "ä½ å¥½ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬å?±å¯?å??"
 
@@ -260,7 +274,7 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s é??å?¯æ??æ??ä¼ è¾? %s ç??æ?®é??ç½?æ¡¥ã??\nè?½ç?¶å?¬èµ·æ?¥ä¸?å¤?é?·ï¼?ä½?æ?¯è¿?äº?æ?®é??ç½?æ¡¥ä¾?ç?¶å?¯ä»¥å?¨å¾?å¤?æ??å?µä¸?å¸®å?©ç»?è¿?å®¡æ?¥ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "ä»?ä¹?æ?¯ç½?æ¡¥ï¼?"
 
@@ -278,8 +292,8 @@ msgstr "é??è¦?ä½¿ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å??é??ç?µå?é?®ä»¶è?³ %sã??æ³¨æ??ï¼?å¿?é¡»ä½¿ç?¨ä»¥ä¸?ç?µå?é?®ç®±å??é??è¯·æ±?ï¼?%sã??%s æ?? %sã??"
+"%s or %s."
+msgstr "è?·å¾? bridgesï¼?ç½?æ¡¥ï¼?ç??å?¦ä¸?ç§?æ?¹æ³?æ?¯å?? %s å??é??ä¸?å°?é?®ä»¶ã??æ³¨æ??ï¼?æ?¨å?ªè?½ä½¿ç?¨ä»¥ä¸?é?®ä»¶æ??å?¡å??æ??ä¾?ç??é?®ä»¶å?°å??å??é??ï¼?%s æ?? %s ã??"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -288,54 +302,44 @@ msgstr "ç?¨ç½?æ¡¥ä¹?æ? æ³?è¿?æ?¥ï¼?é??è¦?å¸®å?©ï¼?"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?è¯·å??é?®ä»¶è?³ %sã??"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "è¯·å°½é??è¯¦ç»?å?°æ??è¿°ä½ ç??æ??å?µï¼?å??æ?¬æ??ç?¨ç??ç½?æ¡¥å??å?¶ç±»å??ï¼?Tor æµ?è§?å?¨ç??æ?¬ä»¥å??ä»»ä½? Tor æ?¾ç¤ºç??ä¿¡æ?¯ç?ç?ã??"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "è?·å¾?ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "è¯·é??æ?©ç±»å??ç±»å??ã??"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¯å?¦é??è¦? %sï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "è¯·è¾?å?¥ä¸?å?¾ä¸ç??å?ç¬¦ï¼?ä¸?å?ºå??å¤§å°?å??ï¼?..."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?ä½¿ç?¨ç½?æ¡¥"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +348,21 @@ msgid ""
 msgstr "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?è¯·å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?è½½é¡µé?¢ %s ç??è¯´æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "å½?â??Tor ç½?ç»?è®¾ç½®â?? å¯¹è¯?æ¡?å?ºç?°æ?¶ï¼?ç?¹å?»â??é??ç½®â?? ï¼?ç?¶å??æ ¹æ?®å??å¯¼æ??ä½?ï¼?ç?´å?°ç??å?°ä¸?é?¢ç??é?®é¢?ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ç½?ç»?æ??ä¾?å??ï¼?ISPï¼?æ??å?¶ä»?äººæ?¯å?¦å¯¹ Tor ç½?ç»?è¿?æ?¥è¿?è¡?å®¡æ?¥æ??å°?é??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -366,28 +370,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?è¯·å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?å¸®å?©ï¼?è¯·ç?¹å?»â??Tor ç½?ç»?è®¾ç½®â??å??å¯¼çª?å?£ä¸ç??â??å¸®å?©â??æ??é?®ã??"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "æ?¾ç¤ºè¿?æ?¡ä¿¡æ?¯ã??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "è¯·æ±?æ?®é??ç½?æ¡¥ã??"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "è¯·æ±?IPv6ç½?ç»?ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§ç±»å??è¯·æ±?ä¸?å??ç??å?¯æ??æ??ä¼ è¾?ç½?æ¡¥ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "è?·å?? BridgeDB ç?? GnuPG å?¬å?±å¯?å??ã??"
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 241a35a48..c4fda3149 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Casper LI <casper.hk@xxxxxxxxxxx>, 2013
 # å¤§å??æ´?è?¥, 2016
 # Casper LI <casper.hk@xxxxxxxxxxx>, 2013
@@ -14,17 +13,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2018-04-12 18:54+0000\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "æ?´æ?°æ?¥èª?"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è?¯çµ¡è³?è¨?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é?¸æ??å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "é¡¯ç¤ºQRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "ä½ å??æ©?æ?¥ç·?è·¯QRCode"
 
@@ -72,58 +86,58 @@ msgstr "ä½ å??æ©?æ?¥ç·?è·¯QRCode"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "æ??å??é¡?ï¼?"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "æ??ç??QRCodeæ??ä¼¼ä¹?ç?¼ç??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "æ¤QRCodeå?«ä½ å??æ©?æ?¥ç·?è·¯ã??ä»¥æµ?å??è£?ç½®æ??ç??å?¯å??å¾?ä½ å??æ©?æ?¥ç·?è·¯ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??ç?¡å?¯ç?¨å??æ©?æ?¥å?¨â?¦"
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr "æ??è??å?¯å??è©¦%sè¿?å??%sï¼?ç?¶å¾?é?¸å??å??å??å??æ©?æ?¥é¡?å??ï¼?"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "æ¥é©?%s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è¼?%s Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "æ¥é©?%s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾?%sæ©?æ?¥å?¨%s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©?%s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
@@ -132,27 +146,27 @@ msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sç??%sæ??æ©?æ?¥ï¼?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sæ?¯%sï¼?"
@@ -160,7 +174,7 @@ msgstr "%sæ?¯%sï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%så??å¾?%sæ©?æ?¥å?¨"
@@ -204,7 +218,7 @@ msgstr "å?¿ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "æ??å??ï¼?ä½ å¥½ï¼?"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬å??"
 
@@ -254,7 +268,7 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDBæ??æ?®é??å??æ©?æ?¥å?¨%sï¼?ç?¡ä»»ä½?\nPluggable Transports %sï¼?æ??è??è?½èµ·å??å??å??ï¼?ä½?\nä»?æ??å?©æ?¼è¦?é?¿å¥½å¤?æ??æ³?ä¸?å??ç¶²çµ¡å¯©æ?¥ã??\n\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "å?©ä¿?æ©?æ?¥ï¼?"
 
@@ -272,8 +286,8 @@ msgstr "æ??é??è¦?å?¦ä¸?æ?¹å¼?å??æ©?æ?¥ï¼?"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?å??å¾?æ©?æ?¥å??æ?¹å¼?ä¿?é?»é?µå?°%sã??è«?æ³¨æ??ï¼?ä½ é ?\nä½¿ç?¨ä¸?å??é?»é?µæ??ä¾?è??å??ä½?å??å??å¯?é?»é?µï¼?\n%sã??%sæ??%sã??"
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸é??ä½?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??Toræ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?å?¯é?»é?µå?°%sã??"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ç?¡å?¯è?½å??å?«æ??å¤?æ??é??ä½ æ??æ³?å??è³?è¨?ï¼?å??æ?¬ä½ å??è©¦ä½¿ç?¨é??å??\næ©?æ?¥å??Pluggable Transportsæ¸?å?®ã??Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ç??æ?¬ï¼?\nä»¥å??Toræ´?è?¥è·¯ç?±é¡¯ç¤ºå??ä»»ä½?è¨?æ?¯ã??"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸å??æ©?æ?¥å?¨é¡?å??ï¼?"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "ä½ é??è¦?IPv6ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "ä½ é??è¦?%så??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "ä½ å??ç??è¦½å?¨å??è?½å¤ æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "è¼¸å?¥ä¸?é?¢å??å??ä¸å??å?å??â?¦"
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "é»?æ¨£é??å§?ä½¿ç?¨æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
 msgstr "å°?æ©?æ?¥å?¨è¼¸å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ï¼?è«?é¦?å??å??å¾?%s Toræ´?è?¥è·¯ç?±\nç??è¦½å?¨ä¸?è¼?é ?é?¢%sï¼?ä¸¦æ??ç?§é ?é?¢ä¸?å??æ??ç¤ºä¸?è¼?å??å??å??Toræ´?è?¥\nè·¯ç?±ç??è¦½å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ç?¶ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??è©±å?£å½?å?ºæ??ï¼?æ?³ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§\næ??ç¤ºï¼?ç?´å?°å?¶è¦?æ±?ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ä½ å??ç¶²çµ¡æ??å??æ??ä¾?è??(ISP)æ??å??æ??é?»æ??æ??é??æ¿¾Toræ´?è?¥è·¯ç?±ç¶²çµ¡å??é?£ç·?ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -360,28 +364,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é?¸å??ã??æ?¯ã??ï¼?ç?¶å¾?æ?³ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?°æ©?æ?¥å?¨ï¼?è«?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼å?°æ??å?è¼¸å?¥å?£ä¸ã??æ??å¾?ï¼?æ?³ã??é?£æ?¥ã??ã??\nå¦?æ??é??å?°éº»ç?©ï¼?è«?å??è©¦æ?³ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??å??ã??èª¬æ??ã??\nå°?æ±?é?²ä¸?æ¥å??å?©ã??"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "é¡¯ç¤ºæ¤è¨?æ?¯ã??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "è«?æ±?Vanillaæ©?æ?¥å?¨ã??"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "è«?æ±?IPv6æ©?æ?¥å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§TYPEè«?æ±?Pluggable Transportã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "å??å¾?BridgeDBå?¬å?±GnuPGé??å??ã??"
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index b49e358ef..f93bfc53b 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # AgustÃn Wu <losangwuyts@xxxxxxxxx>, 2016
 # Chi-Hsun Tsai, 2017
 # danfong <danfong.hsieh@xxxxxxxxx>, 2014
@@ -15,17 +14,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2019-02-23 14:36+0000\n"
-"Last-Translator: å?é?¦ ç??\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "è®?æ?´è¨?é??"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è?¯çµ¡è³?è¨?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "é?¸æ??å?¨é?¨"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "é¡¯ç¤º QRCode"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "æ?¨æ©?æ?¥ç?¨ç?? QRCode"
 
@@ -73,58 +87,58 @@ msgstr "æ?¨æ©?æ?¥ç?¨ç?? QRCode"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "æ??å??é¡?ï¼?"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "æ??æ?? QRCode æ??ä¼¼ä¹?ç?¼ç??é?¯èª¤"
 
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
 msgstr "é??å?? QRCode å?«æ??æ?¨ç??æ©?æ?¥å?¨ç?¸é??è³?è¨?ï¼?å?©ç?¨ QRCode è®?å??ç¨?å¼?å°?æ¤è³?è¨?è¤?è£½é?²è¡?å??é??ç®?è£?ç½®ä¸?ã??"
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¨æ?¥å?¯ç?¨....."
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
 msgstr " ä¹?è¨±æ?¨æ??å??è©¦ %s å??å?° %sï¼?ç?¶å¾?é?¸æ??ä¸?å??ç??æ©?æ?¥é¡?å??!"
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
 msgstr "æ¥é©? %s1%s"
 
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
 msgstr "ä¸?è¼? %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ %s"
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
 msgstr "æ¥é©? %s2%s"
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾? %s æ©?æ?¥å?¨ %s"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©? %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
@@ -133,27 +147,27 @@ msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s %s çµ¦æ??æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -161,7 +175,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s è¨å®?æ©?æ?¥å?¨"
@@ -205,7 +219,7 @@ msgstr "å?¿ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬é??é??é?°"
 
@@ -255,7 +269,7 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥å?¨ %sï¼?æ²?æ??ä»»ä½?\nå?¯æ??æ??å?³è¼¸ %sï¼?é??ä¹?è¨±è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??ç¶²è·¯å¯©æ?¥ã??\n"
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "ä»?éº¼æ?¯æ©?æ?¥å?¨ï¼?"
 
@@ -273,8 +287,8 @@ msgstr "æ??é??è¦?ä½¿ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥å?¨ï¼?"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "å?¦ä¸?ç¨®å??å¾?æ©?æ?¥ç??æ?¹å¼?ç?ºç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨å¾?ä¸?å??é?»å?é?µä»¶æ??ä¾?å» å??ä¹?ä¸?ç??ä½?å??ä¾?ç?¼é??é?»å?é?µä»¶:\n%s, %s æ?? %sã??"
+"%s or %s."
+msgstr "å??å¾?æ©?æ?¥ç??å?¦ä¸?ç¨®æ?¹å¼?æ?¯ç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨ä¾?è?ªä¸?å??é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ç??ä½?å??ç?¼é??é?»å?é?µä»¶: \n%s æ?? %sã??"
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??æ?¨ç??æ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?æ?¨æ??è©²ç?¼é??é?»å?é?µä»¶çµ¦ %sã??"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:121
-msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "è«?å??å?¯è?½ç??çµ¦æ??å??æ?´å¤?é??æ?¼æ?¨ç??å??é¡?ä¹?ç?¸é??è³?è¨?ï¼?å??å?«æ?¨å??è©¦ä½¿ç?¨é??ç?? \næ©?æ?¥å?¨å??å?¯æ??æ??å?³è¼¸ã??æ?¨ç??æ´?è?¥è·¯ç?±ç??è¦½å?¨ç??æ?¬\nä»¥å??æ´?è?¥è·¯ç?±çµ¦å?ºç??ä»»ä½?è¨?æ?¯ã??"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¨é??è¦? %s å??ï¼?"
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "æ?¨ç??ç??è¦½å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
 msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?é??å§?ä½¿ç?¨æ?¨ç??æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,21 @@ msgid ""
 msgstr "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸?è¼?é ?é?¢ %s ä¸¦æ??ç?§é ?é?¢ä¸?ç??èªªæ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??è¦½å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ç?¶ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??å°?è©±å½?å?ºæ??ï¼?æ??ä¸?ä¸?ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§è¨å®?ç²¾é??ç??å°?å¼?é?²è¡?ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??ä¾?æ??å??(ISP)é?»æ??æ??é??æ¿¾æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?å??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -361,28 +365,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥å?¨ï¼?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼ä¸?å?°æ??å?è¼¸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??å°±å¥½ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??è©¦æ??ä¸?ä¸?ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??èª¬æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
 msgstr "é¡¯ç¤ºæ¤è¨?æ?¯ã??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
 msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "å??å¾? BridgeDB ä¸?ç?? GnuPG å?¬é??é??é?°å?¯æ?¬ã??"

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

Prev by Author: [tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
Next by Author: [tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
Previous by thread: [tor-commits] [bridgedb/develop] Merge branch 'release-0.8.3'
Next by thread: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
Index(es):
- Author
- Thread