[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: Tue, 22 Oct 2019 01:46:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 21 Oct 2019 21:46:53 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 6d8fda8a4ced97e36ac000e030d1d1c7538e970a
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Tue Oct 22 01:46:01 2019 +0000

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

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index b5cae6095..f36bb2328 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -31,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -57,8 +57,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -72,19 +72,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ø¹Ø°Ø±Ø§Ù?! ØØ¯Ø« Ø®Ø·Ø£ Ù?Ù? Ø·Ù?Ø¨Ù?."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø§Ù?Ù?ØºØ©"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
 
@@ -123,7 +127,8 @@ msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø°Ø§ Ù?ØØªÙ?Ù? Ø¹Ù?Ù? Ø®Ø·Ù?Ø·
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ø§ Ù?Ù?Ø¬Ø¯ Ø£Ù? bridges Ù?ØªØ§ØØ© ØØ§Ù?Ù?Ø§"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -145,17 +150,19 @@ msgstr "ØÙ?Ù? %s Ù?ØªØµÙ?Ø Tor %s"
 msgid "Step %s2%s"
 msgstr "Ø®Ø·Ù?Ø© %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ø®Ø·Ù?Ø© %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
@@ -164,27 +171,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ø£Ø¹Ø·Ù?Ù? bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªÙ?Ø¯Ù?Ø©"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ù?Ø§"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ù?Ø§ Ø´Ù?Ø¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÙ?%sØ¹Ù?!"
@@ -192,7 +199,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ£%sØµÙ? Ø¹Ù?Ù? Bridges"
@@ -236,7 +243,7 @@ msgstr "Ù?Ø±ØØ¨Ø§Ø? %s "
 msgid "Hello, friend!"
 msgstr "Ù?Ø±ØØ¨Ø§ ,ØµØ¯Ù?Ù?Ù?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ù?Ù?Ø§ØªÙ?Ø Ø¹Ø§Ù?Ø©"
 
@@ -311,47 +318,50 @@ msgstr "Ù?Ù?Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges Ù?Ù? Ø§Ù? ØªØ±Ø³Ù? 
 msgid "My bridges don't work! I need help!"
 msgstr "bridges Ù?Ø§ ØªØ¹Ù?Ù?! Ø£Ù?Ø§ Ø¨ØØ§Ø¬Ø© Ø¥Ù?Ù? Ù?Ø³Ø§Ø¹Ø¯Ø©!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ù?Ø§ Ù?Ù? Ø³Ø·Ù?Ø± Ø§Ù?Ù?Bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ø£ØØµÙ? Ø¹Ù?Ù? Bridges"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ù? Ù?Ø¶Ù?Ù? ØØ¯Ø¯ Ø§Ù?Ø®Ù?Ø§Ø±Ø§Øª Ù?Ù?Ù?Ø¹ Ø§Ù?Ù?bridge"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¥Ù?Ù? %sØ?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?ØªØµÙ?ØÙ? Ù?Ø§ Ù?Ø¹Ø±Ø¶ Ø§Ù?ØµÙ?Ø± Ø¨Ø´Ù?Ù? ØµØÙ?Ø"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ø£Ø¯Ø®Ù? Ø§Ù?ØØ±Ù?Ù? Ø£Ù? Ø§Ù?Ø£Ø±Ù?Ø§Ù? Ù?Ù? Ø§Ù?ØµÙ?Ø±Ø© Ø£Ø¹Ù?Ø§Ù? ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ù?Ù?Ù? ØªØ¨Ø¯Ø£ Ø¨Ø§Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?Ù?bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -360,21 +370,21 @@ msgid ""
 msgstr "Ù?ØªØªÙ?Ù?Ù? Ù?Ù? Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ø¥Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø TorØ? Ø£Ø°Ù?Ø¨ Ø¥Ù?Ù? %s ØµÙ?ØØ© ØªØÙ?Ù?Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø  Tor %s Ù?Ø£ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ù?Ù?Ù?Ø§ Ù?Ù? Ø§Ø¬Ù? ØªØÙ?Ù?Ù? Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ù?ØªØµÙ?Ø  Tor"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -382,28 +392,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ø§Ø®ØªØ§Ø± 'Ù?Ø¹Ù?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? Ø¨Ù?ØµÙ? Ø§Ù?Ù?bridges Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø© Ù?Ù? Ø§Ù?Ù?Ø±Ø¨Ø¹. Ø«Ù? Ø§Ø®ØªØ§Ø± 'Ø§ØªØµØ§Ù?' Ù? Ø§Ø°Ø§ Ù?Ø§Ø¬Ù?ØªÙ? Ù?Ø´Ù?Ù?Ø© Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'Ù?Ø³Ø§Ø¹Ø¯Ø©' Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø§Ø¹Ø¯Ø§Ø¯ Tor."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ø£Ø·Ù?Ø¨ bridges Ø¹Ø§Ø¯Ù?Ø©."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ø£Ø·Ù?Ø¨ IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 d96a0b741..7fc032177 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -35,8 +35,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -50,19 +50,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lÄ± nÉ? isÉ? sÉ?hv oldu."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Problemi XÉ?bÉ?r Ver"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "MÉ?nbÉ? Kodu"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "DÉ?yiÅ?ikliklÉ?r"
 
@@ -101,7 +105,8 @@ msgstr "Bu QR Kodunda kÃ¶rpÃ¼ sÉ?tirlÉ?riniz var. Bunu QR Kod oxuyucularla gÃ¶zd
 msgid "There currently aren't any bridges available..."
 msgstr "HazÄ±rda mÃ¼mkÃ¼n kÃ¶rpÃ¼ yoxdur..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -123,17 +128,19 @@ msgstr "%s Tor SÉ?yyahÄ±nÄ± %s Endir"
 msgid "Step %s2%s"
 msgstr "%s2-ci%s AddÄ±m"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶rpÃ¼ %s Æ?ldÉ? Et"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3-cÃ¼%s AddÄ±m"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
@@ -142,27 +149,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? kÃ¶rpÃ¼lÉ?ri ver!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "TÉ?kmillÉ?Å?dirilmiÅ? SeÃ§imlÉ?r"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Xeyr"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "heÃ§ biri"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sB%sÉ?li!"
@@ -170,7 +177,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶rpÃ¼ Æ?ldÉ? Et"
@@ -214,7 +221,7 @@ msgstr "Ey, %s!"
 msgid "Hello, friend!"
 msgstr "Salam, dost!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ä°ctimai AÃ§arlar"
 
@@ -289,47 +296,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "KÃ¶rpÃ¼lÉ?rim iÅ?lÉ?rmir! KÃ¶mÉ?yÉ? ehtiyacÄ±m var!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "SÉ?nin kÃ¶rpÃ¼ sÉ?tirlÉ?rin:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "KÃ¶rpÃ¼ Æ?ldÉ? Et!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 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:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 Ã¼nvanlara ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ehtiyacÄ±n var?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "SÉ?nin brauzerin Å?É?killÉ?ri gÃ¶stÉ?rÉ? bilmir."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "YuxarÄ±dakÄ± Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +348,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +370,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Vanil kÃ¶rpÃ¼ xahiÅ? et."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶rpÃ¼ xahiÅ? et."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 d24438fd3..634d4e5bc 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-11 11:32+0000\n"
-"Last-Translator: Ð?Ð°Ñ?Ðº Ð?ÐµÑ?Ð¿Ð°Ð»ÐµÐ²Ð½Ñ?Ð¹ <hackcat.dev@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ñ?Ð±Ð°Ñ?Ð°Ð¹Ñ?Ðµ! Ð¨Ñ?Ð¾Ñ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¹Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð¿Ð°Ð´Ñ?Ð°Ñ? Ð°Ð´Ð¿Ñ?Ð°Ñ?ÐºÑ? Ð²Ð°Ñ?Ð°Ð³Ð° Ð·Ð°Ð¿Ñ?Ñ?Ð°."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð¾Ð²Ð°"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ð°Ð²ÐµÐ´Ð°Ð¼iÑ?Ñ? Ð¿Ñ?Ð° Ð±Ð°Ð³."
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð½Ñ?Ñ?Ð½Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ñ?Ñ?Ñ? Ð·Ð¼ÐµÐ½Ð°Ñ?"
 
@@ -103,7 +107,8 @@ msgstr "Ð?Ñ?Ñ?Ñ? QR-ÐºÐ¾Ð´ Ñ?Ñ?Ñ?Ñ?Ð¼Ð»Ñ?Ð²Ð°Ðµ Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð´Ð·ÐµÐ½Ñ? Ð¼Ð¾Ð¼Ð°Ð½Ñ? Ð½Ñ?Ð¼Ð° Ð´Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Ð¡Ð¿Ð°Ð¼Ð¿Ñ?Ð¹Ñ?Ðµ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? %s Ð¼Ð°Ñ?Ñ?Ñ? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¦Ñ?Ð¿ÐµÑ? %s Ð´Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ñ? Tor Browser %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð° Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð½Ðµ Ð³Ñ?Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð´Ð°Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ð?Ð°Ð»Ð°Ð´Ñ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ñ?Ð¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -172,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð?Ð°Ñ?Ñ?Ñ?"
@@ -216,7 +223,7 @@ msgstr "Ð?Ñ?Ñ?Ð²Ñ?Ñ?Ð°Ð½Ð½Ðµ, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ñ?Ð°Ñ?, Ñ?Ñ?Ð±Ñ?Ð°!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð±Ð»Ñ?Ñ?Ð½Ñ?Ñ? Ð?Ð»Ñ?Ñ?Ñ?"
 
@@ -291,47 +298,50 @@ msgstr "Ð?Ð½Ñ?Ñ? Ñ?Ð¿Ð¾Ñ?Ð°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ñ?Ð¿Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? â?? Ð´Ð°Ñ?
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð°Ðµ Ð¼Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð°Ñ?Ñ?Ñ?Ð±Ð½Ð°Ñ? Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Ð?Ð°Ð»i Tor Ð½Ðµ Ð¼Ð¾Ð¶Ð° Ð¿Ð°Ð´ÐºÐ»Ñ?Ñ?Ñ?Ñ?Ñ?Ð°, Ð¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð¹Ñ?Ñ?i Ð½Ð° Ð°Ð´Ð·iÐ½ Ð·Ð° Ð½Ð°Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð°Ñ?: 1%s Ð°Ð±Ð¾ 1%s"
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð²Ð°Ñ?Ñ?Ñ? Ð»Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð°Ð»Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð°Ð±Ñ?Ñ?Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ð´Ñ? Ð´Ð»Ñ? Ñ?Ñ?Ð¿Ñ? Ð¼Ð°Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ IPv6 Ð°Ð´Ñ?Ð°Ñ?Ñ??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð¦Ñ? Ð¿Ð°Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð²Ð°Ð¼ %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Ð°Ð´Ð»Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ðµ Ð²Ñ?Ñ?Ð²Ñ? Ð½ÐµÐºÐ°Ñ?Ñ?ÐºÑ?Ð½Ð°."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð²Ñ?Ð´Ð·Ñ?Ñ?Ðµ Ñ?Ñ?Ð¼Ð²Ð°Ð»Ñ? Ð· Ð²Ñ?Ñ?Ð²Ñ?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð°Ñ?Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð¼Ð°Ñ?Ñ?Ð°Ð¼Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,21 @@ msgid ""
 msgstr "Ð?Ð°Ð± Ð´Ð°Ð´Ð°Ñ?Ñ? Ð½Ð¾Ð²Ñ? Ð¼Ð¾Ñ?Ñ? Ñ? Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ? Tor,  Ñ?Ñ?Ñ?Ð±Ð° Ð¿ÐµÑ?Ð°Ð¹Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ñ?Ð¾Ð½ÐºÑ? Ñ?Ð¿Ð°Ð¼Ð¿Ð¾Ñ?Ð²Ð°Ð½Ð½Ñ? %s Tor Browser\n %s Ñ? Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ð¹ Ð¿Ð° Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ñ?Ñ?Ñ?\nÐ±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð° Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð±Ñ?Ñ?Ñ?Ñ?Ðµ \"Ð¢Ð°Ðº\" Ð° Ð·Ð°Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð°Ð»ÐµÐ¹\". Ð?Ð°Ð± Ð½Ð°Ð»Ð°Ð´Ð·Ñ?Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? Ñ?ÐºÐ°Ð¿Ñ?Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÑ?Ñ?Ñ?Ð°Ñ?Ñ?Ðµ Ñ?Ð°Ð´ÐºÑ? Ð¼Ð°Ñ?Ñ?Ð¾Ñ? Ñ? Ñ?Ñ?ÐºÑ?Ñ?Ð°Ð²Ð°Ðµ Ð²Ð°ÐºÐµÐ½Ñ?Ð°. Ð?Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ðµ \"Ð?Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ð°\"\nÑ? Ð¼Ð¾Ð¶Ð°Ñ?Ðµ Ð¿Ð°Ñ?Ñ?Ð½Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð±Ñ?Ð°Ñ?Ð·Ñ?Ñ?Ð°Ð¼. Ð?Ð°Ð»Ñ? Ð²Ñ? Ñ?Ñ?Ñ?Ñ?ÐºÐ½Ñ?Ð»Ñ?Ñ?Ñ? Ð· Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ð°Ð¼Ñ?,\nÐ¿Ð°Ñ?Ð¿Ñ?Ð°Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°\" Ñ? Ð²Ð°ÐºÐµÐ½Ñ?Ñ? \"Ð¡ÐµÑ?ÐºÐ°Ð²Ñ?Ñ? Ð½Ð°Ð»Ð°Ð´Ñ? Tor\" ÐºÐ°Ð± Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ? Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼ÐºÑ?."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ð»Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ? IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 bae95a413..9d08d887b 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð¡Ñ?Ð¶Ð°Ð»Ñ?Ð²Ð°Ð¼Ðµ! Ð?ÐµÑ?Ð¾ Ñ?Ðµ Ð¾Ð±Ñ?Ñ?ÐºÐ° Ñ? Ð·Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð²Ð¸."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð·Ð¸Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð¡Ð¾Ñ?Ñ? ÐºÐ¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ"
 
@@ -103,7 +107,8 @@ msgstr "Ð¢Ð¾Ð·Ð¸ QRCode Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸. 
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ bridges ..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Ð¡Ð²Ð°Ð»Ð¸ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð·ÐµÐ¼Ð¸ %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð¼Ð¸ Ð´Ð°Ð¹Ñ?Ðµ bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð Ð°Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°!"
@@ -172,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ·ÐµÐ¼Ð¸ Bridges"
@@ -216,7 +223,7 @@ msgstr "Ð¥ÐµÐ¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²ÐµÐ¹, Ð¿Ñ?Ð¸Ñ?Ñ?ÐµÐ»!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ ÐºÐ»Ñ?Ñ?"
 
@@ -291,47 +298,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ bridges Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ?! Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð¢Ñ?Ñ? Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð²Ñ?Ñ?Ð·ÐºÐ¸:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ð·ÐµÐ¼ÐµÑ?Ðµ Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ñ? Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð¸Ð´ bridge:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð·Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ñ?Ðµ Ð¾Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð¾Ñ? Ð³Ð¾Ñ?Ðµ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,21 @@ msgid ""
 msgstr "Ð?Ð° Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° bridges Ð² Tor Browser, Ð¿Ñ?Ñ?Ð²Ð¾ Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° \n%s Tor Browser Ñ?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ %s Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° \nÑ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð°Ð¿Ñ?ÐµÐ´'. Ð?Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ bridges, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¸\nÐ¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ bridge Ñ?ÐµÐ´Ð¾Ð²ÐµÑ?Ðµ Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾ Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ. Ð?Ð° ÐºÑ?Ð°Ñ? Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ 'Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ', Ð¸\nÑ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð´Ð½Ð¾Ñ?Ñ?Ð¸, Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?' Ð±Ñ?Ñ?Ð¾Ð½Ð° Ð²  'Tor Network Settings' Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸ bridges."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ñ?Ð²Ð¸ IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 6b9e403bb..53d114ea4 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -39,8 +39,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -54,19 +54,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¦¦à§?à¦?à¦?à¦¿à¦¤! à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§à§? à¦?à¦¿à¦?à§? à¦à§?à¦² à¦¹à¦¯à¦¼à§?à¦?à§?à¥¤"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¦à¦¾à¦·à¦¾"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¦?à¦?à¦?à¦¿ à¦¤à§?à¦°à§?à¦?à¦¿ à¦°à¦¿à¦ªà§?à¦°à§?à¦? à¦?à¦°à§?à¦¨"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à¦¸à§?à¦°à§?à¦¸ à¦?à§?à¦¡"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à¦¨à§?à¦° à¦¤à¦¾à¦²à¦¿à¦?à¦¾"
 
@@ -105,7 +109,8 @@ msgstr "à¦?à¦? QR à¦?à§?à¦¡à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²
 msgid "There currently aren't any bridges available..."
 msgstr "à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦?à§?à¦¨ à¦¸à§?à¦?à¦¯à§?à¦?à§?à¦¤à¦¿ à¦²à¦¾à¦?à¦¨ à¦¸à¦¹à¦?à¦²à¦à§?à¦¯ à¦¨à§?à¦?..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -127,17 +132,19 @@ msgstr "à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° %s"
 msgid "Step %s2%s"
 msgstr "à¦§à¦¾à¦ª %s 2 %s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¦?à§?à¦? %s à¦¬à§?à¦°à¦¿à¦?  %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¦§à¦¾à¦ª %s 3 %s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¦?à¦?à¦¨ %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦¯à§?à¦?à§?à¦¤ à¦?à¦°à§?à¦¨%s"
@@ -146,27 +153,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ %s à¦?à¦®à¦¾à¦?à§? à¦¶à§?à¦§à§?  à¦¬à§?à¦°à¦¿à¦? à¦¦à¦¾à¦?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¦?à¦¨à§?à¦¨à¦¤ à¦¬à¦¿à¦?à¦²à§?à¦ª"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¦¨à¦¾"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¦?à§?à¦¨à§?à¦?à¦¾ à¦¨à¦¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s %s à¦¹à§?à¦¯à¦¾à¦?"
@@ -174,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
@@ -218,7 +225,7 @@ msgstr "à¦?à¦°à§?, %s!"
 msgid "Hello, friend!"
 msgstr "à¦?à¦¹à§? à¦¬à¦¨à§?à¦§à§?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¦ªà¦¾à¦¬à¦²à¦¿à¦? à¦?à§?"
 
@@ -293,47 +300,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "à¦?à¦®à¦¾à¦° à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦? à¦?à¦°à¦?à§? à¦¨à¦¾! à¦?à¦®à¦¾à¦° à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦¦à¦°à¦?à¦¾à¦°!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¿à¦?à¦?à§?à¦²à¦¿:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "à¦¬à§?à¦°à¦¿à¦? à¦?à¦¾à¦?à¦ª à¦?à¦° à¦?à¦¨à§?à¦¯ à¦¬à¦¿à¦?à¦²à§?à¦ª à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¿ IPv6 à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¦?à¦ªà¦¨à¦¿ à¦?à¦¿ à¦?à¦?à¦?à¦¿ %s à¦ªà§?à¦°à¦¯à¦¼à§?à¦?à¦¨?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¸à¦ à¦¿à¦?à¦à¦¾à¦¬à§? à¦?à¦®à§?à¦? à¦ªà§?à¦°à¦¦à¦°à§?à¦¶à¦¨ à¦?à¦°à¦¾ à¦¹à¦¯à¦¼ à¦¨à¦¾à¥¤"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "à¦?à¦ªà¦°à§?à¦° à¦?à¦¿à¦¤à§?à¦° à¦¥à§?à¦?à§? à¦?à¦?à§?à¦·à¦° à¦?à§?à¦²à¦¿ à¦²à¦¿à¦?à§?à¦¨ ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à¦?à¦¿à¦à¦¾à¦¬à§? à¦¬à§?à¦°à¦¿à¦? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦¶à§?à¦°à§? à¦?à¦°à¦¬à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +352,21 @@ msgid ""
 msgstr "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦¬à§?à¦°à¦¿à¦? à¦ªà§?à¦°à¦¬à§?à¦¶ à¦?à¦°à¦¤à§?, à¦ªà§?à¦°à¦¥à¦®à§? %s à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨\nà¦ªà§?à¦·à§?à¦ à¦¾ %s à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦¬à¦? à¦¶à§?à¦°à§? à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦¸à§?à¦?à¦¾à¦¨à§? à¦¨à¦¿à¦°à§?à¦¦à§?à¦¶à¦¾à¦¬à¦²à§? à¦?à¦¨à§?à¦¸à¦°à¦£ à¦?à¦°à§?à¦¨\nà¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +374,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à¦¹à§?à¦¯à¦¾à¦?' à¦¨à¦¿à¦°à§?à¦¬à¦¾à¦?à¦¨ à¦?à¦°à§?à¦¨ à¦?à¦¬à¦? à¦¤à¦¾à¦°à¦ªà¦° 'à¦ªà¦°à¦¬à¦°à§?à¦¤à§?' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨ à¦?à¦ªà¦¨à¦¾à¦° à¦¨à¦¤à§?à¦¨ à¦¸à§?à¦¤à§? à¦?à¦¨à¦«à¦¿à¦?à¦¾à¦° à¦?à¦°à¦¤à§?, à¦?à¦ªà¦¿ à¦?à¦¬à¦?\nà¦?à§?à¦?à§?à¦¸à¦? à¦?à¦¨à¦ªà§?à¦? à¦¬à¦¾à¦?à§?à¦¸à§? à¦¸à§?à¦¤à§? à¦²à¦¾à¦?à¦¨ à¦?à¦?à¦?à¦¾à¦¨à¥¤ à¦?à¦¬à¦¶à§?à¦·à§?, 'à¦¸à¦?à¦¯à§?à¦?à§?à¦¤' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨, à¦?à¦¬à¦?\nà¦?à¦ªà¦¨à¦¿ à¦¯à§?à¦¤à§? à¦à¦¾à¦² à¦¹à¦¤à§? à¦¹à¦¬à§?! à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦¯à¦¼ à¦ªà¦¡à¦¼à§?à¦¨ à¦¤à¦¬à§? 'à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾' à¦?à§?à¦²à¦¿à¦? à¦?à¦°à¦¾à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨\nà¦?à¦°à¦? à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾ à¦?à¦¨à§?à¦¯ 'à¦?à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦? à¦¸à§?à¦?à¦¿à¦?à¦¸' à¦?à¦?à¦?à¦¾à¦°à§?à¦¡ à¦®à¦§à§?à¦¯à§? à¦¬à¦¾à¦?à¦¨"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "à¦à§?à¦¯à¦¾à¦¨à¦¿à¦²à¦¾ à¦¬à§?à¦°à§?à¦?à¦¸à¦®à§?à¦¹à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 à¦¬à§?à¦°à¦¿à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE à¦¦à§?à¦¬à¦¾à¦°à¦¾ à¦ªà§?à¦²à§?à¦¯à¦¾à¦?à§?à¦¬à¦² à¦?à§?à¦°à¦¾à¦¨à§?à¦¸à¦ªà§?à¦°à§?à¦?à§?à¦° à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 678c09a79..3f8b454e9 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Izvini! NeÅ¡to je poÅ¡lo po zlu sa vaÅ¡im zahtevom."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Prijavi greÅ¡ku"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Izvorni kod"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Promjene"
 
@@ -100,7 +104,8 @@ msgstr "Ovaj QRCode sadrÅ¾i linije briÄ?a. Skenirajte ga QRCode Ä?itaÄ?em kako b
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno nema dostupnih briÄ?eva ..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "Preuzmi %s Tor PretraÅ¾ivaÄ? %s"
 msgid "Step %s2%s"
 msgstr "Korak %s2%s "
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Uzmi %s briÄ? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s "
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sada %s dodajte briÄ?eve Tor pretraÅ¾ivaÄ?u %s"
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo mi daj briÄ?eve!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Napredne Opcije"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "NiÅ¡ta"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sDa%s!"
@@ -169,7 +176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sU%szmi BriÄ?eve"
@@ -213,7 +220,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Zdravo, prijatelju!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni KljuÄ?evi"
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 9734d0df2..028b57334 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-14 22:23+0000\n"
-"Last-Translator: Benny Beat <bennybeat@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Quelcom ha anat malament amb la peticiÃ³."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Llengua"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Comunica un error"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Codi font"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Registre de canvis"
 
@@ -107,7 +111,8 @@ msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escannegeu-lo amb un lector d
 msgid "There currently aren't any bridges available..."
 msgstr "No hi ha ponts disponibles en aquests moments."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Descarrega %s Navegador Tor %s"
 msgid "Step %s2%s"
 msgstr "Pas %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Descarrega %s ponts %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pas %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ara %s adjunta els ponts al Tor Browser %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust donem els meus bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opcions AvanÃ§ades"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Cap"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ!"
@@ -176,7 +183,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sescarrega Bridges"
@@ -220,7 +227,7 @@ msgstr "Hola, %s!"
 msgid "Hello, friend!"
 msgstr "Hola, amic!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claus PÃºbliques"
 
@@ -295,47 +302,50 @@ msgstr "Una altra manera d'obtenir lÃnies de pont Ã©s mitjanÃ§ant un correu-e a
 msgid "My bridges don't work! I need help!"
 msgstr "No em funcionen els ponts! Ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Si no podeu connectar amb el Tor, doneu un cop d'ull a %s i %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Les vostres lÃnies de ponts:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Descarregueu ponts!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Seleccioneu les opcions pel tipus de pont:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Necessiteu adreces IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necessiteu un %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "El navegador no estÃ  mostrant les imatges correctament."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "IntroduÃ¯u els carÃ cters de la imatge superior..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Demanar ponts estÃ ndard."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Demanar ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 cca4e40b2..90f76a8f8 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 12:19+0000\n"
-"Last-Translator: David Stepan <stepand@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,8 +45,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -60,19 +60,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "PromiÅ?te. VÃ¡Å¡ poÅ¾adavek se nepodaÅ?ilo provÃ©st."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "NahlÃ¡sit chybu"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Seznam zmÄ?n"
 
@@ -111,7 +115,8 @@ msgstr "Tento QR kÃ³d obsahuje linky pro vÃ¡Å¡ most. Pro zkopÃrovÃ¡nÃ na mobil
 msgid "There currently aren't any bridges available..."
 msgstr "NynÃ nejsou k dispozici Å¾Ã¡dnÃ© mosty..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -133,17 +138,19 @@ msgstr "StÃ¡hnout %sprohlÃÅ¾eÄ? Tor %s"
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskat %s mosty %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
@@ -152,27 +159,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sen mi dejte mosty!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "RozÅ¡ÃÅ?enÃ¡ nastavenÃ"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Å¾Ã¡dnÃ©"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sA%sno!"
@@ -180,7 +187,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastavit mosty"
@@ -224,7 +231,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Ahoj, pÅ?Ãteli!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VeÅ?ejnÃ© klÃÄ?e"
 
@@ -299,47 +306,50 @@ msgstr "DalÅ¡Ãm zpÅ¯sobem, jak zÃskat pÅ?emostÄ?nÃ, je poslat e-mail na adres
 msgid "My bridges don't work! I need help!"
 msgstr "MÃ© mosty nefungujÃ. PotÅ?ebuji pomoc!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Pokud se nemÅ¯Å¾e VÃ¡Å¡ Tor pÅ?ipojit, prosÃm podÃvejte se na %s a nÃ¡Å¡ %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Zde jsou vaÅ¡e linky k mostÅ¯m: "
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ZÃskat mosty!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Vyberte ÃºrosÃm nastavenÃ pro typ mostu:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "PotÅ?ebujete IPv6 adresu?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "PotÅ?ebujete %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prohlÃÅ¾eÄ? nezobrazuje sprÃ¡vnÄ? obrÃ¡zky."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Zadejte pÃsmena z obrÃ¡zku vÃ½Å¡e..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Jak zaÄ?Ãt pouÅ¾Ãvat mosty."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -348,21 +358,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +380,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "PoÅ¾Ã¡dat o obyÄ?ejnÃ© mosty."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "PoÅ¾Ã¡dat o IPv6 mosty."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 b2251a70c..717a27bd9 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-10 13:15+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Beklager. Noget gik galt med din anmodning."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprog"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "RapportÃ©r en fejl"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ã?ndringslog"
 
@@ -107,7 +111,8 @@ msgstr "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-lÃ¦ser fo
 msgid "There currently aren't any bridges available..."
 msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Download %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Trin %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "FÃ¥ %s broer %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Trin %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s TilfÃ¸j broer til Tor Browser %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare giv mig broer!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avancerede indstillinger"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -176,7 +183,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sent broer"
@@ -220,7 +227,7 @@ msgstr "Hej %s!"
 msgid "Hello, friend!"
 msgstr "Hej min ven!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸gler"
 
@@ -295,47 +302,50 @@ msgstr "En anden mÃ¥de at finde broer er at sende en email til %s. BemÃ¦rk venli
 msgid "My bridges don't work! I need help!"
 msgstr "Mine broer virker ikke! Jeg har brug for hjÃ¦lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Hvis din Tor ikke kan oprette forbindelse, sÃ¥ se %s og vores %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro linjer:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Find broer!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "VÃ¦lg venligst valgmuligheder for brotypen:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Har du brug for IPv6 adresser?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Har du brug for en %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Din browser kan ikke vise billeder ordentligt."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Indtast tegnene fra billedet ovenfor..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Anmod almindelige broer."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Anmod IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 094c4ddea..191b2b041 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -25,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-08 16:27+0000\n"
-"Last-Translator: Philipp Winter\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -51,8 +51,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -66,19 +66,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprache"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Einen Fehler melden"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Quellcode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ã?nderungsprotokoll"
 
@@ -117,7 +121,8 @@ msgstr "Dieser QR-Code beinhaltet Ihre BrÃ¼ckenverbindungen. Scannen Sie ihn mit
 msgid "There currently aren't any bridges available..."
 msgstr "Im Moment sind keine BrÃ¼cken verfÃ¼gbar â?¦"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -139,17 +144,19 @@ msgstr "%s Tor Browser %s herunterladen"
 msgid "Step %s2%s"
 msgstr "Schritt %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s BrÃ¼cken %s erhalten"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Schritt %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
@@ -158,27 +165,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sir nur BrÃ¼cken geben!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Erweiterte Optionen"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nein"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "keine"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -186,7 +193,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%srÃ¼cken erhalten"
@@ -230,7 +237,7 @@ msgstr "Hallo, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo Freund!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ã?ffentliche SchlÃ¼ssel"
 
@@ -305,47 +312,50 @@ msgstr "Eine weitere MÃ¶glichkeit, um BrÃ¼cken zu erhalten, ist eine E-Mail an %
 msgid "My bridges don't work! I need help!"
 msgstr "Meine BrÃ¼cken-Server funktionieren nicht! Ich brauche Hilfe!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Falls Tor keine Verbindung herstellen kann, lesen Sie bitte %s und %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Hier sind Ihre BrÃ¼ckenadressen:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Erhalten Sie Adressen von BrÃ¼cken-Servern!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Bitte wÃ¤hlen Sie die Optionen fÃ¼r den BrÃ¼ckentyp aus:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "BenÃ¶tigen Sie IPv6-Adressen?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BenÃ¶tigen Sie eine %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +364,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +386,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Standard-BrÃ¼cken anfordern."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6-BrÃ¼cken anfordern."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 9f061af68..8ac4eb073 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -48,8 +48,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -63,19 +63,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Î£Ï?Î³Î½Ï?Î¼Î·! Î?Î¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬ Î¼Îµ Ï?Î¿ Î±Î¯Ï?Î·Î¼Î¬ Ï?Î±Ï?."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Î?Î»Ï?Ï?Ï?Î±"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
 
@@ -114,7 +118,8 @@ msgstr "Î?Ï?Ï?Ï? Ï?Î¿ QRCode Ï?ÎµÏ?Î¹ÎÏ?ÎµÎ¹ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±
 msgid "There currently aren't any bridges available..."
 msgstr "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î´Î¹Î±Î¸ÎÏ?Î¹Î¼ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -136,17 +141,19 @@ msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Î?Î®Î¼Î± %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Î?Ï?Î¿ÎºÏ?Î®Ï?Ï?Îµ Ï?Î¹Ï? %s Î³ÎÏ?Ï?Ï?ÎµÏ?%s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Î?Î®Î¼Î± %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browser %s"
@@ -155,27 +162,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÎ?%sÏ?Î»Ï?Ï? Î´Ï?Ï?Îµ Î¼Î¿Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Î?Ï?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Î?Ï?Î¹"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ÎºÎ±Î½ÎÎ½Î±"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÎ?%sÎ±Î¹!"
@@ -183,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÎ?%sÎ®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½"
@@ -227,7 +234,7 @@ msgstr "Î?ÎµÎ¹Î¬ Ï?Î±Ï?, %s!"
 msgid "Hello, friend!"
 msgstr "Î?ÎµÎ¹Î± Ï?Î¿Ï?, Ï?Î¯Î»Îµ!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Î?Î·Î¼Ï?Ï?Î¹Î± Î?Î»ÎµÎ¹Î´Î¹Î¬"
 
@@ -302,47 +309,50 @@ msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬, Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ?, Ï?Ï?Îµ
 msgid "My bridges don't work! I need help!"
 msgstr "Î?Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Î¿Ï? Î´ÎµÎ½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¿Ï?Î½! Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ Î²Î¿Î®Î¸ÎµÎ¹Î±! "
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³Ï?Î±Î¼Î¼ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Î?Î®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¹Ï? ÎµÏ?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Î¿Î½ Ï?Ï?Ï?Î¿ Ï?Î·Ï? Î³ÎÏ?Ï?Ï?Î±Ï?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Î§Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ Î¼Î¹Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· IPv6;"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Î?Î®Ï?Ï?Ï? Ï?Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ ÎÎ½Î± %s;"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Î? browser Ï?Î±Ï? Î´ÎµÎ½ ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Ï?Î¹Ï? ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Ï?Î¬."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÏ?Î®Ï?ÎµÏ? Î±Ï?Ï? Ï?Î·Î½ Ï?Î±Ï?Î±Ï?Î¬Î½Ï? Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î¯Î±..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Î Ï?Ï? Î½Î± Î±Ï?Ï?Î¯Ï?ÎµÏ?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Î±Ï?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +361,21 @@ msgid ""
 msgstr "Î?Î¹Î± Î½Î± ÎµÎ¹Ï?Î¬Î³ÎµÏ?Îµ bridges Ï?Ï?Î¿ Tor Browser, Î±Ï?Ï?Î¹ÎºÎ¬ ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ %s Tor Browser Ï?ÎµÎ»Î¯Î´Î±\nÎºÎ±Ï?ÎµÎ²Î¬Ï?Î¼Î±Ï?Î¿Ï?%s ÎÏ?ÎµÎ¹Ï?Î± Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¹Ï? Î¿Î´Î·Î³Î¯ÎµÏ? Î³Î¹Î± ÎºÎ±Ï?ÎÎ²Î±Ï?Î¼Î± ÎºÎ±Î¹ ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +383,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ \"Î?Î±Î¹\" ÎºÎ±Î¹ Î¼ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î?Ï?Ï?Î¼ÎµÎ½Î¿\". Î?Î¹Î± Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î± Î½ÎÎ± Ï?Î±Ï? \nbridges, Î±Î½Ï?Î¹Î³Ï?Î¬Ï?Ï?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î¼Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Ï?Î½ bridges Ï?Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ \nÎºÎµÎ¹Î¼ÎÎ½Î¿Ï?. Î?ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î£Ï?Î½Î´ÎµÏ?Î·\" ÎºÎ±Î¹ Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ¯Ï?Ï?Îµ ÎµÎ½Ï?Î¬Î¾ÎµÎ¹! Î?Î½ \nÎ±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Ï?ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î±, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ \"Î?Î¿Î®Î¸ÎµÎ¹Î±\" Ï?Ï?Î¹Ï? \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? \nÎ´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\"."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Î?Î¯Ï?Î·Ï?Î· Ï?Î±Î»Î¹Ï?Î½ ÎºÎ±Î»Ï?Î½ bridges."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Î?Î¯Ï?Î·Ï?Î· IPv6 Î³ÎµÏ?Ï?Ï?Ï?Î½."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 50395fe70..5343f926b 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Source Code"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Changelog"
 
@@ -102,7 +106,8 @@ msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to
 msgid "There currently aren't any bridges available..."
 msgstr "There are no bridges available currently..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr "Download %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Step %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Get %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Step %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Now %s add the bridges to Tor Browser %s"
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
@@ -215,7 +222,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -290,47 +297,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 89b8816d4..eb4ea2090 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Pardonu! Io ne funkcias pri via peto."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingvo"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "raporti cimo"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "fontkodo"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Å?anÄ?oprotokolo"
 
@@ -104,7 +108,8 @@ msgstr "Ä?i tiu QR-kodo enhavas viajn ponto liniojn. Skanu Ä?in per QR-leganto p
 msgid "There currently aren't any bridges available..."
 msgstr "Nuntempe ne ekzistas retpontojn."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "elÅ?uti %s Tor-retumilo %s"
 msgid "Step %s2%s"
 msgstr "paÅ?o %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ekhavi %s retpotojn %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "paÅ?o %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%suj donu retpontojn al mi!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "detalaj opcioj"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "neniom/neniu"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%ses!"
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sE%skhavi Bridges"
@@ -217,7 +224,7 @@ msgstr "Saluton, %s!"
 msgid "Hello, friend!"
 msgstr "Saluton, amiko!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "publikaj Å?losiloj"
 
@@ -292,47 +299,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Jen viaj retpontoj:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ekhavu retpontojn!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Bonvolu selekti opciojn pri retpontospeco."
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ä?u vi bezonas IPv6-adresojn?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ä?u vi bezonas %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Via retumilo vidigas bildojn ne dece."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Enigu la literoj en la bildo Ä?i-supre."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kiel komenci uzi viajn retpontojn."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Peti IPv6-retpontojn."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 1a11c74ff..f9df51a99 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-17 08:00+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -50,8 +50,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -65,19 +65,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Informar sobre un error"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Registro de cambios"
 
@@ -116,7 +120,8 @@ msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©alo con un lector
 msgid "There currently aren't any bridges available..."
 msgstr "Ahora mismo no hay ningÃºn puente disponible..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -138,17 +143,19 @@ msgstr "Descarga %s el Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Paso %s2%s "
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Consigue %s puentes %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s "
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
@@ -157,27 +164,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡Dame %sS%sÃ³lo puentes! "
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -185,7 +192,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sC%sonseguir Puentes"
@@ -229,7 +236,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -304,47 +311,50 @@ msgstr "Otra forma de obtener puentes es enviar un correo a %s. Ten en cuenta qu
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis puentes no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Si tu Tor no puede conectar, lee el %s y nuestro %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Estas son tus lÃneas de puente de red:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Â¡Obtener puentes!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecciona opciones para el tipo de puente:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no estÃ¡ mostrando las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Introduce los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -353,21 +363,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -375,28 +385,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Solicitar puentes estÃ¡ndar."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Solicitar puente de red IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 3d820ce36..3b378fbf0 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-16 18:30+0000\n"
-"Last-Translator: kaze kaze <kaze@xxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -42,8 +42,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -57,19 +57,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Â¡Lo sentimos! Algo saliÃ³ mal con tu solicitud."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "BitÃ¡cora de cambios"
 
@@ -108,7 +112,8 @@ msgstr "Este cÃ³digo QR contiene tus lÃneas de bridge. Escanealo con un lector
 msgid "There currently aren't any bridges available..."
 msgstr "En este momento no existen bridges disponibles..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -130,17 +135,19 @@ msgstr "Descargar el %s Navegador Tor %s"
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregÃ¡ los puentes al Navegador Tor %s"
@@ -149,27 +156,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡%sS%solamente dÃ¡me bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡%sS%sÃ!"
@@ -177,7 +184,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtener bridges"
@@ -221,7 +228,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -296,47 +303,50 @@ msgstr "Otra manera de obtener pasarelas es enviando un correo electrÃ³nico a %s
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis bridges no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Si Tor no puede conectarse, por favor verifica  %s y en nunstro%s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "AquÃ estÃ¡n tus lÃneas de bridges:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Â¡ObtenÃ© Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccionÃ¡ opciones para tipo de bridge:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿NecesitÃ¡s direcciones IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿NecesitÃ¡s una %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imÃ¡genes correctamente."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "IngresÃ¡ los caracteres de la imagen..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -345,21 +355,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +377,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Pedir bridges ordinarios."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Pedir bridges IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 b6dc414ba..68ed0e273 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -40,8 +40,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -55,19 +55,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "PerdÃ³n! Algo saliÃ³ mal con tu peticiÃ³n."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lenguaje"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Reportar un error"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Registro de cambios"
 
@@ -106,7 +110,8 @@ msgstr "Este cÃ³digo QR contiene entradas de tus repetidores/puentes. LÃ©elo con
 msgid "There currently aren't any bridges available..."
 msgstr "Actualmente no hay ningÃºn repetidor/puente disponible..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -128,17 +133,19 @@ msgstr "Descargar %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtener %s repetidores/puentes %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
@@ -147,27 +154,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Â¡SÃ³lo(%sJ%s) dame los repetidores/puentes!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ninguno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "Â¡SÃ(%sY%s)!"
@@ -175,7 +182,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "Obtener(%sG%s) repetidores/puentes"
@@ -219,7 +226,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola, amigo!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves PÃºblicas"
 
@@ -294,47 +301,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis puentes no funcionan! Â¡Necesito ayuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Aqui estan tus puentes:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Â¡Obten puentes!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor selecciona las opciones para tu tipo de puente:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no muestra las imagenes correctamente"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ponga los caracteres de la imagen de arriba..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Como empezar a usar tus puentes."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +353,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +375,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Solicita un puente por defecto"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Solicita puentes IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 d1798814e..ed520807c 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Vabandust! Midagi lÃ¤ks Teie pÃ¤ringuga valesti."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Teatage viga"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "LÃ¤htekood"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Muudatuste logi"
 
@@ -103,7 +107,8 @@ msgstr "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et
 msgid "There currently aren't any bridges available..."
 msgstr "Ã?htegi silda ei ole hetkel saadaval..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Lae alla %s Tor brauser %s"
 msgid "Step %s2%s"
 msgstr "%s2%s samm."
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hangi %s sillad %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s samm."
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¼Ã¼d %s lisa sillad Tor\\'i brauserisse%s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sihtsalt anna mulle sillad!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "TÃ¤psemad seaded"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "mitte Ã¼kski"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sah!"
@@ -172,7 +179,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sangi sillad"
@@ -216,7 +223,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Tervist, sÃµber!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Avalikud VÃµtmed"
 
@@ -291,47 +298,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Mu sillad ei tÃ¶Ã¶ta! Vajan abi!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Siin on teie silla read:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Hangi sillad!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Palun valige silla tÃ¼Ã¼p:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Kas teil on vaja IPv6 aadresse?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Kas teil on vaja %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Sisestage Ã¼lemisel pildil olevad sÃ¼mbolid..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kuidas alustada oma sildade kasutamist"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Esita pÃ¤ring tavaliste sildade jaoks."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Esita pÃ¤ring IPv6 sildade jaoks."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 576af2c8c..60b6c2adf 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Eman errore baten berri"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Iturburu-kodea"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Changelog-a"
 
@@ -107,7 +111,8 @@ msgstr "QR kode hau zure zubi-lerroak dauzka. Eskaneatu QR kode irakurle batekin
 msgid "There currently aren't any bridges available..."
 msgstr "Momentuz ez daude zubirik..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Jaitsi %s Tor Nabigatzailea %s"
 msgid "Step %s2%s"
 msgstr "%s2.%s urratsa"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Eskuratu %s zubiak %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3.%s urratsa"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Orain %s gehitu zubiak Torera %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust emaidazu zubiak!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Aukera Aurreratuak"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ez"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Bat ere ez."
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sB%sai!"
@@ -176,7 +183,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -220,7 +227,7 @@ msgstr "Kaixo, %s!"
 msgid "Hello, friend!"
 msgstr "Kaixo, lagun!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Gako Publikoak"
 
@@ -295,47 +302,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Zubiak Lortu!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 helbideak behar dituzu?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s behar duzu?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Sartu goiko irudiko karaktereak..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Nola hasi zure zubiak erabiltzen"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Eskatu IPv6 zubiak."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 5f72b8975..bcf6ca5a6 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -46,8 +46,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -61,19 +61,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ù?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø¯Ø± Ø±Ø§Ø¨Ø·Ù? Ø¨Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø®Ø·Ø§Û?Û? Ø±Ø® Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø²Ø¨Ø§Ù?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
 
@@ -112,7 +116,8 @@ msgstr "Ø§Û?Ù? QRCode Ø´Ø§Ù?Ù? Ù?Ø³Û?Ø±Ù?Ø§Û? Ù¾Ù? Ø´Ù?Ø§ Ù?Û? Ø¨Ø§Ø´Ø¯. Ø¢Ù? Ø±
 msgid "There currently aren't any bridges available..."
 msgstr "Ù?Ù?â??Ø§Ú©Ù?Ù?Ù? Ù?Û?Ú? Ù¾Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?Û?Ø³Øª..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -134,17 +139,19 @@ msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
 msgid "Step %s2%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª %s Ù¾Ù?â?? Ù?Ø§  %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ù?Ø±ØÙ?Ù? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ø§Ú©Ù?Ù?Ù?Ø? %s Ø§Ù?Ø²Ù?Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± %s"
@@ -153,27 +160,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÙ?%sÙ?Ø· Ù¾Ù? Ù?Ø§ Ø±Ø§ Ø¨Ù?Ù? Ø¨Ø¯Ù?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ú¯Ø²Û?Ù?Ù?â??Ù?Ø§Û? Ù¾Û?Ø´Ø±Ù?ØªÙ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ù?Ù?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ù?Û?Ú?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sØ¨%sÙ?Ù?!"
@@ -181,7 +188,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sØ¯%sØ±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§"
@@ -225,7 +232,7 @@ msgstr "Ø³Ù?Ø§Ù?Ø?  %s!"
 msgid "Hello, friend!"
 msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³Øª Ù?Ù?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ú©Ù?Û?Ø¯Ù?Ø§Û? Ø¹Ù?Ù?Ù?Û?"
 
@@ -300,47 +307,50 @@ msgstr "Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?
 msgid "My bridges don't work! I need help!"
 msgstr "Ø¨Ù? Ú©Ù?Ú© Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?! Ù¾Ù?â??Ù?Ø§Û? Ù?Ù? Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ù?Ø¯!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ø®Ø·Ù?Ø· Ù¾Ù? Ø´Ù?Ø§ Ø¯Ø± Ø§Û?Ù?Ø¬Ø§:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ø·Ù?Ø§ Ú¯Ø²Û?Ù?Ù? Ù?Ù?Ø¹ Ù¾Ù? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? IPv6 Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯ Ø¨Ù? Û?Ú© %sØ?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?Ø±Ù?Ø±Ú¯Ø± Ø´Ù?Ø§ ØªØµØ§Ù?Û?Ø± Ø±Ø§ Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ù?Ù?Ø§Û?Ø´ Ù?Ù?Û? Ø¯Ù?Ø¯."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ú©Ø§Ø±Ø§Ú©ØªØ± Ù?Ø§ Ø±Ø§ Ø§Ø² ØªØµÙ?Û?Ø± Ø¨Ø§Ù?Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +359,21 @@ msgid ""
 msgstr "Ø¨Ø±Ø§Û? Ù?Ø±Ù?Ø¯ Ø¨Ù? Ù¾Ù? Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø? Ø¨Ø±Ø§Û? Ø§Ù?Ù?Û?Ù? Ø¨Ø§Ø± %s Ø¨Ù? Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø±Ù?Ø±Ú¯Ø± Tor \nØµÙ?ØÙ? %s Ù? Ù¾Ø³ Ø§Ø² Ø¢Ù? Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Ø¯Ø³ØªÙ?Ø±Ø§Ù?Ø¹Ù?Ù?  Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø²\nÙ?Ø±Ù?Ø±Ú¯Ø± Tor Ø¨Ø±Ù?Û?Ø¯."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +381,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Ø¨Ù?Ù?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù? Ù? Ø³Ù¾Ø³ 'Ø¨Ø¹Ø¯Û?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. Ø¨Ø±Ø§Û? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ø¬Ø¯Û?Ø¯ Ø®Ù?Ø¯, copy Ù? paste Ú©Ù?Û?Ø¯ Ø®Ø·Ù?Ø· Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?ØªÙ? Ø¬Ø¹Ø¨Ù? Ù?Ø±Ù?Ø¯Û?. Ø¯Ø± Ù?Ù?Ø§Û?Øª, Ø±Ù?Û? 'Ø§ØªØµØ§Ù?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯,\nØ±Ø§Ù? Ø¯Ø±Ø³ØªØ´ Ø§Û?Ù? Ø§Ø³Øª! Ø§Ú¯Ø± Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?Ø¯, Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ø±Ù?Û? Ú©Ù?Û?Ø¯ 'Ø±Ø§Ù?Ù?Ù?Ø§'\nØ¯Ø± 'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' wizard Ø¨Ø±Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø¹Ø§Ø¯Û?"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 9ce2ea3ce..460764f6b 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -44,8 +44,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -59,19 +59,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "PyyntÃ¶si epÃ¤onnistui jostain syystÃ¤."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kieli"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ilmoita ohjelmointivirheestÃ¤"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "LÃ¤hdekoodi"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Muutosloki"
 
@@ -110,7 +114,8 @@ msgstr "TÃ¤mÃ¤ QR-koodi sisÃ¤ltÃ¤Ã¤ siltarivisi. Skannaa se QR-koodinlukijalla k
 msgid "There currently aren't any bridges available..."
 msgstr "TÃ¤llÃ¤ hetkellÃ¤ ei ole yhtÃ¤Ã¤n siltaa saatavilla..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -132,17 +137,19 @@ msgstr "Lataa %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Vaihe %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hanki %s sillat %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Vaihe %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
@@ -151,27 +158,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%snna minulle vain sillat!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "LisÃ¤valitsimet"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ei"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ei mitÃ¤Ã¤n"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sK%syllÃ¤!"
@@ -179,7 +186,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sae sillat"
@@ -223,7 +230,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hei ystÃ¤vÃ¤!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
@@ -298,47 +305,50 @@ msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoittees
 msgid "My bridges don't work! I need help!"
 msgstr "Siltani eivÃ¤t toimi! Tarvitsen apua!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "TÃ¤ssÃ¤ ovat siltarivisi:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Hae sillat!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Valitse valitsimet siltatyypille:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Tarvitsetko IPv6-osoitteita?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Tarvitsetko %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Selaimesi ei nÃ¤ytÃ¤ kuvia oikein."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "SyÃ¶tÃ¤ merkit ylÃ¤puolella olevasta kuvasta..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kuinka aloitat siltojesi kÃ¤ytÃ¶n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +357,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +379,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "PyydÃ¤ tavallisia siltoja."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "PyydÃ¤ IPv6-siltoja."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 2cb1d9a27..418eb86fd 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-18 14:09+0000\n"
-"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -55,8 +55,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -70,19 +70,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "DÃ©solÃ©â??! Un problÃ¨me est survenu Ã  la suite de votre requÃªte."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Langue"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Signaler un bogue"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Code source"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Journal des changements"
 
@@ -121,7 +125,8 @@ msgstr "Ce code QR contient vos lignes de ponts. Lisez-le avec un lecteur de cod
 msgid "There currently aren't any bridges available..."
 msgstr "Aucun pont nâ??est disponible actuellementâ?¦"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -143,17 +148,19 @@ msgstr "TÃ©lÃ©chargez %s le NavigateurÂ Tor %s"
 msgid "Step %s2%s"
 msgstr "Ã?tape %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obtenez des %s ponts %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ã?tape %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
@@ -162,27 +169,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Donnez-moi %sj%suste des pontsâ??!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Options avancÃ©es"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "aucun"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sO%suiâ??!"
@@ -190,7 +197,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbtenir des ponts"
@@ -234,7 +241,7 @@ msgstr "Bonjour, %sâ??!"
 msgid "Hello, friend!"
 msgstr "Bonjour, lâ??amiâ??!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "ClÃ©s publiques"
 
@@ -309,47 +316,50 @@ msgstr "Une autre faÃ§on dâ??obtenir des ponts est dâ??envoyer un courriel Ã  %s
 msgid "My bridges don't work! I need help!"
 msgstr "Mes ponts ne fonctionnent pas, jâ??ai besoin dâ??aideâ??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Si Tor nâ??arrive pas Ã  se connecter, veuillez consulter le %s et notre %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Voici vos lignes de pontsâ??:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Obtenez des pontsâ??!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Veuillez choisir des options pour le type de pontsâ??:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Avez-vous besoin dâ??adresses IPv6â???"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Votre navigateur nâ??affiche pas les images correctement."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Saisir les caractÃ¨res de lâ??image ci-dessusâ?¦"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Comment commencer Ã  utiliser vos pontsâ???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -358,21 +368,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -380,28 +390,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Demander des ponts traditionnels."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Demander des ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 268162dfd..902a9a4c8 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-12 17:32+0000\n"
-"Last-Translator: Kevin Scannell <kscanne@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?r leithscÃ©al! BhÃ fadhb leis an iarratas a rinne tÃº."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Teanga"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Tuairiscigh Fabht"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³d Foinseach"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Logchomhad athruithe"
 
@@ -100,7 +104,8 @@ msgstr "TÃ¡ do chuid lÃnte droichid laistigh den chÃ³d QR seo. Is fÃ©idir Ã© a
 msgid "There currently aren't any bridges available..."
 msgstr "NÃl aon droichead ar fÃ¡il faoi lÃ¡thair..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "Ã?oslÃ³dÃ¡il %s BrabhsÃ¡laÃ Tor %s"
 msgid "Step %s2%s"
 msgstr "CÃ©im %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Faigh %s droichid %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "CÃ©im %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Anois %s cuir na droichid le BrabhsÃ¡laÃ Tor %s"
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sN%sÃ theastaÃonn uaim ach droichid!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ardroghanna"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃl"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "dada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sÃ¡!"
@@ -169,7 +176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sF%saigh Droichid"
@@ -213,7 +220,7 @@ msgstr "HÃ³ra a %s!"
 msgid "Hello, friend!"
 msgstr "Dia dhuit a chara!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Eochracha PoiblÃ"
 
@@ -288,47 +295,50 @@ msgstr "Is fÃ©idir droichid a fhÃ¡il freisin trÃ rÃomhphost a sheoladh chuig %
 msgid "My bridges don't work! I need help!"
 msgstr "NÃl mo chuid droichead ag obair! TÃ¡ cÃºnamh uaim!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Mura bhfuil tÃº in ann ceangal le Tor, fÃ©ach ar an %s agus ar Ã¡r %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Seo do chuid lÃnte droichid:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Faigh Droichid!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Roghanna don chineÃ¡l droichid:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "An dteastaÃonn seoltaÃ IPv6 uait?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "An dteastaÃonn %s uait?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 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:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Cuir isteach na carachtair Ã³n ÃomhÃ¡ thuas..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Iarr gnÃ¡thdhroichid."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Iarr droichid IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 92bb89cba..55590e52e 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Innis mu mhearachd"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ²d TÃ¹sail"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Clar-atharraich"
 
@@ -100,7 +104,8 @@ msgstr "Tha na loidhnichean drochaid agad sa ChÃ²d QR seo. Sganaich an cÃ²d leis
 msgid "There currently aren't any bridges available..."
 msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "Luchdaich a-nuas %s Brabhsair Tor %s"
 msgid "Step %s2%s"
 msgstr "Ceum %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Faigh %s drochaidean %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ceum %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sheir dhomh drochaidean!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Roghainnean adhartach"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Chan eil"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Chan eil gin"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sha!"
@@ -169,7 +176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sF%saigh Drochaidean"
@@ -213,7 +220,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo a charaid!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Iuchairichean Poblach"
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Seo do loidhnichean-drochaid:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Faigh Drochaidean!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "A bheil feum agad air seolaidhean-IPv6?"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "A bheil feum agad air seÃ²laidhean IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Am feum thu %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dÃ²igh cheart."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "SgrÃ¬obh a-steach na caractaran bhon Ã¬omhaigh gu h-Ã irde..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Faighnich airson drochaidean vanilla."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Faighnich airson drochaidean IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 e45f2f538..669d504b3 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: Oscar Guardiola <Oscar.Guardiola@xxxxxxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "SentÃmolo! Algo foi mal coa sÃºa solicitude."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Informar dun Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Rexistro de Cambios"
 
@@ -104,7 +108,8 @@ msgstr "Este CÃ³digo QR contÃ©n as sÃºas liÃ±as ponte. EscanÃ©eo cun lector de c
 msgid "There currently aren't any bridges available..."
 msgstr "Non hai pontes dispoÃ±ibles agora mesmo..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "Descargar %s Tor Bowser %s"
 msgid "Step %s2%s"
 msgstr "Paso %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter as %s pontes %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Paso %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora %s engada as pontes ao Tor Browser %s"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%sÃ³amente dame pontes!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpciÃ³ns Avanzadas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Non"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ningÃºn"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%si!"
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
@@ -217,7 +224,7 @@ msgstr "Ola, %s!"
 msgid "Hello, friend!"
 msgstr "Ola amigo/a!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -292,47 +299,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "As miÃ±as pontes non funcionan! Necesito axuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Estas son as sÃºas liÃ±as ponte:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor seleccione opciÃ³ns para o tipo de ponte:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Necesita direcciÃ³ns IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necesita vostede un %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador non estÃ¡ amosando imaxes adecuadamente."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Introduza os caracteres da imaxen de enrriba..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Solicitar pontes estÃ¡ndar."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Solicitar pontes IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 9b4e29df5..1c4a21b46 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "àª®àª¾àª« àª?àª°àª¶à«?! àª¤àª®àª¾àª°à«? àªµàª¿àª¨àª?àª¤à«? àª¸àª¾àª¥à«? àª?àª?àª?àª? àª?à«?àª?à«?àª? àª¥àª¯à«?àª?."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "àª¸àª®àª¸à«?àª¯àª¾àª¨à«? àª?àª¾àª£ àª?àª°à«?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "àª¸à«?àª¤à«?àª°à«?àª¤ àª?à«?àª¡"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "àª¨à«?àª?àª§àª£à«?àª? àª¬àª¦àª²à«?"
 
@@ -100,7 +104,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr "àª¹àª¾àª²àª®àª¾àª? àª?à«?àª? bridges àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°à«? %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "àªªàª?àª²à«?àª? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "àª?àª¦à«?àª¯àª¤àª¨ àªµàª¿àª?àª²à«?àªªà«?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "àª¨àª¹àª¿"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "àª?àª?àª? àª¨àª¹à«?àª?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sàª¹àª¾%s"
@@ -169,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sàª®à«?%sàª³àªµà«? Bridges"
@@ -213,7 +220,7 @@ msgstr "àª¹àª¾àª¯, %s!"
 msgid "Hello, friend!"
 msgstr "àª¨àª®àª¸à«?àª¤à«?, àª®àª¿àª¤à«?àª°!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr ""
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "bridges àª®à«?àª³àªµà«?!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 326050f70..9b2d786a2 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 17:30+0000\n"
-"Last-Translator: ION\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -44,8 +44,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -59,19 +59,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "×¡×?×?×?×?! ×?×©×?×? ×?×©×ª×?×© ×?×?×§×©×? ×©×?×?."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "×©×¤×?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "×?×?×?×? ×¢×? ×ª×§×?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "×§×?×? ×?×§×?×¨"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "×?×?×?×? ×©×?× ×?×?×?×?"
 
@@ -110,7 +114,8 @@ msgstr "×§×?×? QR ×?×? ×?×?×?×? ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?. ×¡×¨×?×§ ×?
 msgid "There currently aren't any bridges available..."
 msgstr "×?×?×? ×?×¨×?×¢ ×?×©×¨×?×? ×?×?×?× ×?×? ×?×?×©×?×?..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -132,17 +137,19 @@ msgstr "×?×?×¨×? ×?×ª %s ×?×¤×?×¤×? Tor %s"
 msgid "Step %s2%s"
 msgstr "×©×?×? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "×?×©×? %s ×?×©×¨×?×? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "×©×?×? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
@@ -151,27 +158,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s×¨%s×§ ×ª×? ×?×? ×?×©×¨×?×?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "×?×¤×©×¨×?×?×?×ª ×?×ª×§×?×?×?×ª"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "×?×?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "×?×£ ×?×?×?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s×?%s×?!"
@@ -179,7 +186,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s×§%s×?×? ×?×©×¨×?×?"
@@ -223,7 +230,7 @@ msgstr "×?×?×?, %s!"
 msgid "Hello, friend!"
 msgstr "×©×?×?×?, ×?×?×¨!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "×?×¤×ª×?×?×ª ×¦×?×?×?×¨×?×?×?"
 
@@ -298,47 +305,50 @@ msgstr "×?×¨×? ×?×?×¨×ª ×?×?×©×?×? ×?×©×¨×?×? ×?×?×? ×?×©×?×?×? ×?×?×?\"×? ×?×?
 msgid "My bridges don't work! I need help!"
 msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×¦×¨×?×? ×¢×?×¨×?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "×?×? Tor ×©×?×? ×?×?× ×? ×?×?×?×? ×?×?×ª×?×?×¨, ×?× ×? ×?×¢×£ ×?×?×? ×¢×? %s ×?×¢×? %s ×©×?× ×?."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "×?×?×?×? ×©×?×¨×?×ª ×?×?×©×¨ ×©×?×?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "×?×©×? ×?×©×¨×?×?!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "×?× ×? ×?×?×¨ ×?×¤×©×¨×?×?×?×ª ×?×¡×?×? ×?×?×©×¨:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? ×?×ª×?×?×?×ª IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "×?×?×¤×?×¤×? ×©×?×? ×?×? ×?×¦×?×? ×ª×?×?× ×?×ª ×?×¨×?×?×?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "×?×?× ×¡ ×?×ª ×?×ª×?×?×?×? ×?×?×ª×?×?× ×? ×?×?×¢×?×?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "×?×?×? ×?×?×ª×?×?×? ×?×?×©×ª×?×© ×?×?×©×¨×?×? ×©×?×?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +357,21 @@ msgid ""
 msgstr "×?×?×? ×?×?×?× ×?×¡ ×?×©×¨×?×? ×?×ª×?×? ×?×¤×?×¤×? Tor, ×¨×?×©×?×ª ×?×? ×?×? %s ×?×£ ×?×?×¨×?×ª ×?×¤×?×¤×? Tor %s ×?×?×?×?×¨ ×?×?×? ×¢×§×?×? ×?×?×¨ ×?×?×?×¨×?×?×ª ×¢×?×?×¨ ×?×?×¨×?×? ×?×?×ª×?×?×? ×©×? ×?×¤×?×¤×? Tor."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +379,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "×?×?×¨ '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?×ª×¦×¨ ×?×ª ×?×?×©×¨×?×? ×?×?×?×©×?×? ×©×?×?, ×?×¢×ª×§ ×?×?×?×?×§ ×?×ª ×©×?×¨×?×ª ×?×?×©×¨×?×? ×?×ª×?×? ×ª×?×?×ª ×?×§×?×? ×©×? ×?×?×?×?. ×?×?×¡×?×£, ×?×?×¥ ×¢×? '×?×ª×?×?×¨' ×?×?×ª×? ×?×?×?×¨ ×?×?×?×?×ª ×?×?×?×?! ×?×? ×ª×?×?×?×? ×ª×§×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ '×¢×?×¨×?' ×?×?×©×£ '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¡×?×?×¢ × ×?×¡×£."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "×?×§×© ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "×?×§×© ×?×©×¨×? IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "×?×§×© ×ª×¢×?×?×¨×? × ×ª×?×§×? ×¢\"×? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 49c89cbee..2b19de7d5 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¤?à¥?à¤·à¤®à¤¾ à¤?à¤°à¥?à¤? ! à¤?à¤ªà¤?à¤¾ à¤?à¤¨à¥?à¤°à¥?à¤§ à¤ªà¥?à¤°à¤¾ à¤¨à¤¹à¥?à¤? à¤?à¤¿à¤¯à¤¾ à¤?à¤¾ à¤¸à¤?à¤¾à¥¤ "
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¤à¤¾à¤·à¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¤?à¤¿à¤¸à¥? à¤¤à¥?à¤°à¥?à¤?à¥? à¤?à¥? à¤¬à¤¾à¤°à¥?à¤? à¤®à¥?à¤? à¤¬à¤¤à¤¾à¤?à¤?à¥¤ "
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à¤¸à¤?à¤?à¥?à¤¤ à¤²à¤¿à¤ªà¤¿ à¤?à¤¾ à¤¸à¥?à¤¤à¥?à¤°à¥?à¤¤à¥¤"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨à¤¸à¥?à¤?à¥?à¥¤"
 
@@ -103,7 +107,8 @@ msgstr "à¤¯à¤¹ QRCode à¤?à¤ªà¤?à¥? bridge lines à¤°à¤?à¤¤à¤¾ à¤¹à¥?à¤?. à¤?à¤ª
 msgid "There currently aren't any bridges available..."
 msgstr "à¤?à¤¸ à¤¸à¤®à¤¯ à¤?à¥?à¤? bridge à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¹à¥?à¤? à¤¹à¥?à¤? ..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "%s Tor Browser %s à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤°à¥?à¤?."
 msgid "Step %s2%s"
 msgstr "à¤?à¤°à¤£ %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s bridges %s à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤? "
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¤?à¤°à¤£ %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¤?à¤¬ %s bridges à¤?à¥? Tor Browser à¤¸à¥? à¤?à¥?à¥?à¥?à¤? %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¤?à¥?à¤µà¤²%s bridges à¤¦à¥?à¤?à¤¿à¤¯à¥? !"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¤?à¤¨à¥?à¤¨à¤¤ à¤µà¤¿à¤?à¤²à¥?à¤ª"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¤¨à¤¹à¥?à¤?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¤?à¥?à¤? à¤à¥? à¤¨à¤¹à¥?à¤?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¤?à¥?%s à¤¹à¤¾à¤?!"
@@ -172,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sB%sridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤¹à¥? à¤°à¤¹à¥? à¤¹à¥?à¤?."
@@ -216,7 +223,7 @@ msgstr "à¤?à¤°à¥?, %s!"
 msgid "Hello, friend!"
 msgstr "à¤¨à¤®à¤¸à¥?à¤¤à¥?, à¤¦à¥?à¤¸à¥?à¤¤!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? à¤?à¥?à¤?à¤?à¥?"
 
@@ -291,47 +298,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "à¤®à¥?à¤°à¥? Bridges à¤?à¤¾à¤® à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¥? à¤¹à¥?! à¤®à¥?à¤?à¥? à¤®à¤¦à¤¦ à¤?à¤¾à¤¹à¤¿à¤?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à¤¯à¥? à¤°à¤¹à¥? à¤?à¤ªà¤?à¥? bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¤¾à¤?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Bridges à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¥?à¤?!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "à¤?à¥?à¤ªà¤¯à¤¾ Bridge à¤?à¥? à¤ªà¥?à¤°à¤?à¤¾à¤° à¤?à¤¾ à¤µà¤¿à¤?à¤²à¥?à¤ª à¤?à¥?à¤¨à¤¿à¤?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? IPv6 à¤ªà¤¤à¥?à¤? à¤?à¥? à¤?à¤°à¥?à¤°à¤¤ à¤¹à¥??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¤?à¥?à¤¯à¤¾ à¤?à¤ªà¤?à¥? %s à¤?à¤¾à¤¹à¤¿à¤??"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "à¤?à¤ªà¤?à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¥?à¤° à¤«à¥?à¤?à¥?à¤? à¤?à¥? à¤ à¥?à¤? à¤¸à¥? à¤ªà¥?à¤°à¤¦à¤°à¥?à¤¶à¤¿à¤¤ à¤¨à¤¹à¥?à¤? à¤?à¤° à¤°à¤¹à¤¾ à¤¹à¥?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "à¤?à¤ªà¤° à¤?à¥? à¤?à¤¿à¤¤à¥?à¤° à¤¸à¥? à¤?à¤?à¥?à¤·à¤° à¤¡à¤¾à¤²à¥?."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à¤?à¤ªà¤?à¥? bridges à¤?à¥? à¤?à¤¸à¥?à¤¤à¥?à¤®à¤¾à¤² à¤?à¤°à¤¨à¤¾ à¤?à¥?à¤¸à¥? à¤¶à¥?à¤°à¥? à¤?à¤°à¥?à¤??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,21 @@ msgid ""
 msgstr "Tor Browser à¤®à¥?à¤? bridges à¤®à¥?à¤? à¤ªà¥?à¤°à¤µà¥?à¤¶ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, à¤¸à¤¬à¤¸à¥? à¤ªà¤¹à¤²à¥? %s Tor Browser à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤ªà¥?à¤? à¤ªà¤° à¤?à¤¾à¤?à¤?\n%s à¤?à¤° à¤?à¤¸à¤?à¥? à¤¬à¤¾à¤¦ à¤µà¤¹à¤¾à¤? à¤ªà¤° Tor Browser à¤?à¥? à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ à¤?à¤° à¤¶à¥?à¤°à¥? à¤?à¤°à¤¨à¥? à¤?à¥? à¤¨à¤¿à¤°à¥?à¤¦à¥?à¤¶à¥?à¤? à¤?à¤¾ à¤ªà¤¾à¤²à¤¨ à¤?à¤°à¥?à¤?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à¤¹à¤¾à¤?' à¤?à¥?à¤¨à¥? à¤?à¤° à¤¤à¤¬ 'à¤?à¤?à¥?' à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤?. à¤?à¤ªà¤¨à¥? à¤¨à¤? bridges à¤?à¥? configure à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤?, bridges à¤ªà¤?à¤?à¥?à¤¤à¤¿à¤¯à¥?à¤? \nà¤?à¥? à¤?à¥?à¤ªà¥? à¤?à¤°à¤?à¥?  à¤?à¥?à¤?à¥?à¤¸à¥?à¤? à¤?à¤¨à¤ªà¥?à¤? à¤¬à¥?à¤?à¥?à¤¸à¤®à¥?à¤? à¤ªà¥?à¤¸à¥?à¤? à¤?à¤° à¤¦à¥?à¤?. à¤?à¤?à¤¤ à¤®à¥?à¤?,\"à¤¸à¤?à¤ªà¤°à¥?à¤? à¤?à¤°à¥?à¤?\" à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?à¤¸à¤¬ à¤?à¥?à¤? à¤?à¤ªà¤¨à¥? à¤?à¤ª à¤¹à¥? à¤?à¤¾à¤?à¤?à¤¾. \nà¤¯à¤¦à¤¿ à¤?à¤ªà¤?à¥? à¤¸à¤¾à¤®à¤¨à¥? à¤?à¥?à¤? à¤ªà¤°à¥?à¤¶à¤¾à¤¨à¥?\nà¤?à¤¯à¥? à¤¤à¥?  à¤?à¤?à¥? à¤?à¥? à¤¸à¤¹à¤¾à¤¯à¤¤à¤¾ à¤?à¥? à¤²à¤¿à¤? Tor à¤¨à¥?à¤?à¤µà¤°à¥?à¤? à¤¸à¥?à¤?à¤¿à¤?à¤? à¤®à¥?à¤? \"à¤®à¤¦à¤¦\" à¤¬à¤?à¤¨ à¤ªà¤° à¤?à¥?à¤²à¤¿à¤? à¤?à¤° à¤¦à¥?à¤?."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "vanilla bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 bridges à¤?à¥? à¤²à¤¿à¤? à¤¨à¤¿à¤µà¥?à¤¦à¤¨ à¤?à¤°à¥?à¤?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 08ab2508f..ba7da1695 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! NeÅ¡to je poÅ¡lo po krivu s VaÅ¡im zahtjevom."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Prijavite greÅ¡ku"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Izvorni kod"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Zapisnik o promjenama"
 
@@ -103,7 +107,8 @@ msgstr "Ovaj QR kod sadrÅ¾i VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR k
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno nema dostupnih mostova..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Preuzmi %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Preuzmi %s mostove %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sad %s dodaj mostove u Tor Browser %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo mi daj mostove!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Napredne opcije"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niÅ¡ta"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -172,7 +179,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sreuzmi mostove"
@@ -216,7 +223,7 @@ msgstr "Bok, %s!"
 msgid "Hello, friend!"
 msgstr "Bok, prijatelju!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni kljuÄ?evi"
 
@@ -291,47 +298,50 @@ msgstr "JoÅ¡ jedan naÄ?in za dobiti mostove je da poÅ¡aljete email na %s. Imajte
 msgid "My bridges don't work! I need help!"
 msgstr "Moji mostovi ne rade! Treba mi pomoÄ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ovo su linije vaÅ¡ih mostova:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Preuzmite mostove!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Molimo odaberite opcije za tip mosta:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Trebaju li Vam IPv6 adrese?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trebate li %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ preglednik ne prikazuje slike ispravno."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Unesite znakove sa slike iznad..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kako poÄ?eti koristite mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "ZatraÅ¾i dobre, stare mostove."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "ZatraÅ¾i IPv6 mostove."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 96e53cff5..e36d073c2 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -54,19 +54,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 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/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Nyelv"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Hiba jelentÃ©se"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ForrÃ¡s kÃ³d"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "VÃ¡ltozÃ¡sok"
 
@@ -105,7 +109,8 @@ msgstr "Ez a QR KÃ³d a hÃd sorait tartalmazza. Olvassa be egy QR KÃ³d olvasÃ³va
 msgid "There currently aren't any bridges available..."
 msgstr "Jelenleg nincsenek rendelkezÃ©sre Ã¡llÃ³ hidak..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -127,17 +132,19 @@ msgstr "LetÃ¶ltÃ©s %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "LÃ©pÃ©s %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Hidak %s beszerzÃ©se"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "LÃ©pÃ©s %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor Browser-hez %s"
@@ -146,27 +153,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%ssak adjÃ¡l mÃ¡r nekem hidakat!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "HaladÃ³ beÃ¡llÃtÃ¡sok"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nem"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Semmi"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%szeretnÃ©k!"
@@ -174,7 +181,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%szerezni Bridge -et!"
@@ -218,7 +225,7 @@ msgstr "HÃ©, %s!"
 msgid "Hello, friend!"
 msgstr "Hello!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "NyilvÃ¡nos kulcsok"
 
@@ -293,47 +300,50 @@ msgstr "MÃ¡sik mÃ³dszer hidak beszerzÃ©sÃ©re email kÃ¼ldÃ©sÃ©vel lehetsÃ©ges a %
 msgid "My bridges don't work! I need help!"
 msgstr "A HÃdjaim nem mÅ±kÃ¶dnek! SegÃtsÃ©gre van szÃ¼ksÃ©gem!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Itt vannak a hÃd soraid:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Hidak szerzÃ©se!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "KÃ©rjÃ¼k, vÃ¡lasszon opciÃ³t a hÃd tÃpushoz:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Kellenek Ã¶nnek IPv6 cÃmek?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "SzÃ¼ksÃ©ge van egy %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 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:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Adja meg a karaktereket amik a fenti kÃ©pen lÃ¡thatÃ³ak ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +352,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +374,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Nem csatlakoztathatÃ³ szÃ¡llÃtÃ³ hÃd kÃ©relme."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPV6 hÃd kÃ©rÃ©se."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 818ad61b5..ce7fef5f0 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?Õ¡Õ¾:"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ô¼Õ¥Õ¦Õ¸Ö?Õ¶"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Õ?Õ¡ÕµÕ¿Õ¶Õ¥Õ¬ Õ½ÕÕ¡Õ¬Õ« Õ´Õ¡Õ½Õ«Õ¶"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¸Õ¤"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Õ?Õ¸Ö?Õ¸ÕÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö?Õ« Õ´Õ¡Õ¿ÕµÕ¡Õ¶"
 
@@ -102,7 +106,8 @@ msgstr "Ô±ÕµÕ½ QR-Õ¯Õ¸Õ¤Õ¨ ÕºÕ¡Ö?Õ¸Ö?Õ¶Õ¡Õ¯Õ¸Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±
 msgid "There currently aren't any bridges available..."
 msgstr "Ô±ÕµÕªÕ´ Õ¸Õ¹ Õ´Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ» Õ¹Õ¯Õ¡â?¦"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr "Õ?Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ %sÂ«TorÂ» Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ¨%s"
 msgid "Step %s2%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ %s Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Õ?Õ¡ÕµÕ¬ %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ«Õ¶%s"
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÕ?%sÕ¡Ö?Õ¦Õ¡ÕºÕ¥Õ½ Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Ö?"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ô¼Ö?Õ¡Ö?Õ¸Ö?Ö?Õ«Õ¹ Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö?Õ¥Ö?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Õ?Õ¹"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Õ¢Õ¡Ö?Õ¡Õ¯Õ¡ Õ§"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÔ±%sÕµÕ¸Ö?"
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÕ?%sÕ¿Õ¡Õ¶Õ¡Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶"
@@ -215,7 +222,7 @@ msgstr "Õ?Õ¥Õ?Õµ, %sÖ?"
 msgid "Hello, friend!"
 msgstr "Ô²Õ¡Ö?Ö?Õ?, Õ¨Õ¶Õ¯Õ¥Ö?Õ½:"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Õ?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö?"
 
@@ -290,47 +297,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Ô»Õ´ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ Õ¹Õ¥Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´Ö? Ô»Õ¶Õ± Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ§ ÕºÕ¥Õ¿Ö?Ö?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ô±Õ°Õ¡ Õ?Õ¥Ö? bridge line-Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Õ?Õ¿Õ¡Ö?Õ¥Õ?Ö? Bridge-Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ bridge-Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¶Õ¥Ö?Õ¨."
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ¥Õ¶ IPv6 Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?:"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ§ %s:"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Õ?Õ¥Ö? Õ¢Ö?Õ¡Õ¸Ö?Õ¦Õ¥Ö?Õ¨ Õ¶Õ¯Õ¡Ö?Õ¶Õ¥Ö?Õ¨ Õ³Õ·Õ¿Õ¸Ö?Õ¥Õ¶ Ö?Õ¸Ö?ÕµÖ? Õ¹Õ« Õ¿Õ¡Õ¬Õ«Õ½:"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ?Ö? Õ¿Õ¡Õ¼Õ¡Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö?Õ¨ Õ¾Õ¥Ö?Ö?Õ« Õ¶Õ¯Õ¡Ö?Õ«Ö?:"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ô»Õ¶Õ¹ÕºÕ¥Õ?Õ½ Õ½Õ¯Õ½Õ¥Õ¬ Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬ Õ?Õ¥Ö? bridge-Õ¶Õ¥Ö?Õ¨:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,21 @@ msgid ""
 msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? bridge-Õ¶Õ¥Ö?Õ¨ Tor Browser, Õ¶Õ¡Õ Õ´Õ¿Õ¥Õ?Ö? %sTor Browser-Õ« Õ¶Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ§Õ»Õ¨%s Ö? Õ°Õ¥Õ¿Ö?Õ¥Õ?Ö? Õ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶Õ? Õ¶Õ¥Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö? Ö? Õ£Õ¸Ö?Õ®Õ¡Ö?Õ¯Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Tor Browser-Õ¨:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Õ?Õ¥Õ²Õ´Õ¥Ö? Â«Ô±ÕµÕ¸Â», Õ«Õ½Õ¯ Õ°Õ¥Õ¿Õ¸ Â«Õ?Õ¡Õ»Õ¸Ö?Õ¤Õ¨Â»: Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Õ?Õ¥Ö? Õ¶Õ¸Ö? bridge-Õ¶Õ¥Ö?Õ¨, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö? Ö?\nÕ¿Õ¥Õ²Õ¡Õ¤Ö?Õ¥Ö? bridge line-Õ¨ Õ¿Õ¥Ö?Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö?Õ´: Õ?Õ¥Ö?Õ»Õ¸Ö?Õ´, Õ½Õ¥Õ²Õ´Õ¥Ö? Â«Õ?Õ«Õ¡Õ¶Õ¡Õ¬Â», Ö? Ô´Õ¸Ö?Ö? ÕºÕ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ¯Õ¬Õ«Õ¶Õ¥Ö?: ÔµÕ©Õ¥ Õ¹Õ¯Õ¸Õ²Õ´Õ¶Õ¸Ö?Õ¸Õ·Õ¾Õ¥Ö?Õ? Ö?Õ¸Ö?Õ±Õ¥Ö? Õ½Õ¥Õ²Õ´Õ¥Õ¬ Â«Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Â»\nÕ¯Õ¸Õ³Õ¡Õ¯Õ¨ Â«Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Â»-Õ¸Ö?Õ´Õ? Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö?:"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ô´Õ«Õ´Õ¥Õ¬ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ô´Õ«Õ´Õ¥Õ¬ IPv6 bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 254b469b9..01141172b 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -23,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 15:14+0000\n"
-"Last-Translator: Suryadi Harun <suryadiharun08@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,8 +49,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -64,19 +64,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Laporkan bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kode Sumber"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Perubahan"
 
@@ -115,12 +119,13 @@ msgstr "QRCode ini berisi garis jembatan Anda. Pindai dengan pembaca QRCode untu
 msgid "There currently aren't any bridges available..."
 msgstr "Belum ada bridge yang tersedia..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr " Mungkin Anda harus mencoba %s kembali  %s dan memilih tipe jenis jembatan yang berbeda!"
+msgstr " Mungkin Anda harus mencoba %s kembali  %s dan memilih tipe jembatan yang berbeda!"
 
 #: bridgedb/distributors/https/templates/index.html:11
 #, python-format
@@ -137,17 +142,19 @@ msgstr "Unduh %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Langkah %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s bridge %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
@@ -156,27 +163,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serikan saya bridge!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Pilihan Lebih Lanjut"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -184,7 +191,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sapatkan Jembatan!"
@@ -228,7 +235,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Halo, kawan!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Kunci Publik"
 
@@ -303,47 +310,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Berikut jembatan Anda:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Dapatkan Jembatan!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Mohon pilih opsi untuk tipe jembatan:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Apakah Anda membutuhkan alamat IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Apakah Anda membutuhkan %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan karakter dari gambar di atas..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Cara memulai menggunakan jembatan Anda"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +362,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -374,28 +384,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Minta jembatan yang biasa."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Minta jembatan IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 8c8084c25..b1f13ed49 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 12:58+0000\n"
-"Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?bbs! EitthvaÃ° fÃ³r ÃºrskeiÃ°is varÃ°andi beiÃ°nina Ã¾Ãna."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "TungumÃ¡l"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Tilkynna um villu"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "GrunnkÃ³Ã°i"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "BreytingaannÃ¡ll"
 
@@ -100,7 +104,8 @@ msgstr "Ã?essi QR-kÃ³Ã°i inniheldur brÃºarlÃnurnar Ã¾Ãnar. SkannaÃ°u QR-kÃ³Ã°a
 msgid "There currently aren't any bridges available..."
 msgstr "Engar brÃ½r eru tiltÃ¦kar Ã augnablikinu..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "SÃ¦kja %s Tor-vafrann %s"
 msgid "Step %s2%s"
 msgstr "Skref %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "NÃ¡ Ã %s brÃ½r %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Skref %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃºna Ã¡ aÃ° %s bÃ¦ta brÃºnum viÃ° Tor-vafrann %s"
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%sefÃ°u mÃ©r bara brÃ½rnar!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "NÃ¡nari stillingar"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ekkert"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÃ¡!"
@@ -169,7 +176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sÃ¡ Ã brÃ½r"
@@ -213,7 +220,7 @@ msgstr "HÃ¦, %s!"
 msgid "Hello, friend!"
 msgstr "SÃ¦ll vinur!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Dreifilyklar"
 
@@ -288,47 +295,50 @@ msgstr "Ã?nnur leiÃ° til aÃ° nÃ¡ Ã brÃ½r er aÃ° senda tÃ¶lvupÃ³st til %s. Athug
 msgid "My bridges don't work! I need help!"
 msgstr "BrÃ½rnar mÃnar virka ekki! Ã?g Ã¾arf hjÃ¡lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Ef Tor nÃ¦r ekki aÃ° tengjast hjÃ¡ Ã¾Ã©r, skaltu endilega skoÃ°a %s og %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "HÃ©r eru brÃºarlÃnurnar Ã¾Ãnar:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "SÃ¦kja brÃ½r!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Veldu valkosti fyrir tegund brÃºar:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ã?arftu IPv6-vistfÃ¶ng?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ã?arftu %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Vafrinn Ã¾inn birtir myndir ekki rÃ©tt."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Settu inn stafina Ãºr myndinni hÃ©r aÃ° ofan..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "BiÃ°ja um venjulegar brÃ½r."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "BiÃ°ja um IPv6-brÃ½r."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 f4be8a13a..ed8eab739 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-08 09:30+0000\n"
-"Last-Translator: Random_R\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -52,8 +52,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -67,19 +67,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Siamo spiacenti ma qualcosa Ã¨ andato storto con la tua richiesta."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Segnala un Problema"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Codice sorgente"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "NovitÃ "
 
@@ -118,7 +122,8 @@ msgstr "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore
 msgid "There currently aren't any bridges available..."
 msgstr "Non ci sono bridge disponibili al momento..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -140,17 +145,19 @@ msgstr "Scarica %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ottenere dei %s bridge %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
@@ -159,27 +166,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sammi i bridge e basta!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opzioni Avanzate"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nessuno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ¬!"
@@ -187,7 +194,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sttieni Bridge"
@@ -231,7 +238,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Ciao amico!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
@@ -306,47 +313,50 @@ msgstr "Un altro modo per ottenere dei bridge Ã¨ inviare un'email a %s. Nota che
 msgid "My bridges don't work! I need help!"
 msgstr "I miei bridge non funzionano! Mi serve aiuto!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Se il tuo Tor non puÃ² connettersi, dai un'occhiata a %s e il nostro %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ecco le tue linee bridge:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ottieni dei Bridge!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Seleziona le opzioni per il tipo di bridge:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ti servono indirizzi IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ti serve un %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Il tuo browser non mostra le immagini in modo corretto."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Inserisci i caratteri nell'immagine sopra..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +365,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -377,28 +387,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Richiedi bridge vanilla."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Richiedi bridge IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 554c9844a..38ce787b2 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-20 02:07+0000\n"
-"Last-Translator: h345u37g3 h345u37g3\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -42,8 +42,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -57,19 +57,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "è¨?èª?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ã??ã?°ã??å ±å??ã??ã??"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "å¤?æ?´å±¥æ´"
 
@@ -108,7 +112,8 @@ msgstr "ã??ã?®ã??ã?ªã??ã?¸ã?®QRã?³ã?¼ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§
 msgid "There currently aren't any bridges available..."
 msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -130,17 +135,19 @@ msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
 msgid "Step %s2%s"
 msgstr "ã?¹ã??ã??ã?? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "ã?¹ã??ã??ã?? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
@@ -149,27 +156,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sè¨%så®?ã?ªã??ã?®ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é«?åº¦ã?ªè¨å®?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ã?ªã??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sã?¯%sã??ï¼?"
@@ -177,7 +184,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sã??%sã?ªã??ã?¸ã??å?¥æ??ã??ã??"
@@ -221,7 +228,7 @@ msgstr "ã??ã??ã?«ã?¡ã?¯ã??%sã??ã??ï¼?"
 msgid "Hello, friend!"
 msgstr "ã??ã??ã?«ã?¡ã?¯ï¼?"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬é??é?µ"
 
@@ -296,47 +303,50 @@ msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®æ?¹æ³?ã?¨ã??ã?¦%sã?«ã?¡ã?¼ã?«ã??é??ã??
 msgid "My bridges don't work! I need help!"
 msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Torã??æ?¥ç¶?ã?§ã??ã?ªã??å ´å??ã??%sã?¨ç§?ã??ã?¡ã?®%sã??ã??è¦§ã??ã? ã??ã??ã??"
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ï¼?"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??è¡¨ç¤ºã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -345,21 +355,21 @@ msgid ""
 msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??è¦§ã??ã? ã??ã??ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã?¸ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã?«ã?¯ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ï¼?ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??\næº?å??å®?äº?ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«\nã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "ã??ã??ã?¬ã?¼ã?³ã??ã?ªã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 f8d6634aa..4654945ec 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 15:52+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á?? á? á??á?¦á??á?ª á??á??á? á??á??."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á??á??"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "á?®á??á? á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "á??á??á? á??á??á??á?¬á?§á??á? á?? á??á??á??á??"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "á?ªá??á??á??á??á??á??á??á??á??"
 
@@ -103,7 +107,8 @@ msgstr "QR-á??á??á??á?? á?¨á??á??á?ªá??á??á?¡ á??á?¥á??á??á??á?? á??á??á??á??á??
 msgid "There currently aren't any bridges available..."
 msgstr "á??á??á??á??á??á??á?? á??á? á?ªá??á? á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á?? á??á? á??á?? á?®á??á??á??á??á?¡á??á?¬á??á??á??á??á??..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? %s Tor-á??á? á??á?£á??á??á? á?? %s"
 msgid "Step %s2%s"
 msgstr "á??á??á??á??á?¯á?? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "á??á??á??á?¦á??á?? %s á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "á??á??á??á??á?¯á?? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %s"
@@ -144,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sá?£%sá??á? á??á??á??á?? á??á??á??á??á?ªá??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "á??á??á??á??á?¢á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "á??á? á??"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "á??á? á?ªá??á? á??á??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sá??%sá??á??á?®!"
@@ -172,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sá??%sá??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á??á??á?? (Bridges)"
@@ -216,7 +223,7 @@ msgstr "á??á??á??á??á? á?¯á??á??á??, %s!"
 msgid "Hello, friend!"
 msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á??, á??á??á??á??á??á??á? á??!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "á?¡á??á?¯á??á? á?? á??á??á?¡á??á?¦á??á??á??á??á??"
 
@@ -291,47 +298,50 @@ msgstr "á??á??á??á??á?? á??á? á??á?? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®
 msgid "My bridges don't work! I need help!"
 msgstr "á?©á??á??á?? á?®á??á??á??á??á?? á??á?  á??á?£á?¨á??á??á??á?¡! á??á??á?®á??á??á? á??á??á?? á??á?á??á? á??á??á??á??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "á??á?£ á??á?¥á??á??á??á?? Tor á??á??á?  á?£á??á??á??á?¨á??á? á??á??á??á??, á??á??á?®á??á??á?? á??á?®á??á??á??á?? %s á??á?? á?©á??á??á??á?? %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "á??á?¥ á??á? á??á?¡ á??á?¥á??á??á??á?? á?¡á??á?®á??á??á?? á?®á??á??á??á??á??:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "á??á??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "á??á??á?®á??á??á??, á??á??á?£á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? IPv6-á??á??á?¡á??á??á??á? á??á??á??á???"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "á??á?¥á??á??á??á?? á??á? á??á?£á??á??á? á?? á??á?  á??á?©á??á??á??á??á??á?¡ á?¡á?£á? á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "á?¨á??á??á?§á??á??á??á??á?? á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á?? á??á? á?¡á??á??á?£á??á?? á?¡á?£á? á??á??á??á??á??á??..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "á? á??á??á??á?  á?£á??á??á?? á??á??á??á??á??á??á?§á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,21 @@ msgid ""
 msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á?¨á??á?¡á??á?§á??á??á??á??á??, á??á??á??á??á??á??á??á? á??á??á??á??á?? á??á??á??á??á??á??á?? %sTor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡\ná??á??á??á? á??á??á?? %s á??á?? á?¨á??á??á??á??á?? á??á??á?§á??á??á??á?? á??á?¥ á??á??á?ªá??á??á?£á?? á??á??á??á??á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡á?? á??á??\ná??á??á?¨á??á??á??á??á?¡ á??á??á??á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "á??á??á?£á??á??á??á??á?? â??á??á??á??á?®â?? á??á?? á?¨á??á??á??á??á?? á??á??á?¬á??á??á??á??á?? â??á?¨á??á??á??á??á??â??. á??á?¥á??á??á??á?? á??á?®á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??, á??á??á?¦á??á?? á??á?¡á??á?? á??á??\ná?©á??á?¡á??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á?? á?¢á??á?¥á?¡á?¢á??á?¡ á?¨á??á?¡á??á?§á??á??á?? á??á??á??á?¨á??. á??á??á??á??á?¡ á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á??á?¨á??á? á??á??á??â?? á??á??\ná?¬á??á?¡á??á?? á?§á??á??á??á??á?¤á??á? á?? á??á??á?£á?¨á??á??á??á??á?¡! á??á?£ á? á??á??á?? á??á??á??á? á??á??á??á??á??á??á?¡ á??á??á??á??á??á?¬á?§á??á??á??á??á??, á?¡á?ªá??á??á??á?? â??á??á??á?®á??á??á? á??á??á??á?¡â?? á?¦á??á??á??á??á??á??\ná??á??á?¬á??á??á??á??á??á?? â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á??á??á??á??á?£á? á?¨á??, á??á??á??á??á?¢á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á?¡ á??á??á?¡á??á?¦á??á??á??á??."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "á?©á??á??á?£á??á??á??á? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6-á??á??á?¡á??á??á??á? á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "á??á??á?¡á??á??á? á??á??á??á??á??á?? TYPE-á??á??á??á??á??á?§á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 7cef6a792..3680be695 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?ÐµÑ?Ñ?Ñ?Ñ?Ò£Ñ?Ð·, Ñ?Ñ?Ð·Ð´Ñ?Ò£ Ñ?Ò±Ñ?Ð°Ð½Ñ?Ñ?Ñ?Ò£Ñ?Ð· Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±ÐµÐ»Ð³Ñ?Ñ?Ñ?Ð· Ò?Ð¸Ñ?Ð½Ñ?Ñ?Ð»Ñ?Ò?Ñ?Ð°Ñ? Ð±Ð°Ñ?. "
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð¢Ñ?Ð»"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ò?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ð»Ñ? Ñ?Ð°Ð±Ð°Ñ?Ð»Ð°Ñ?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¿Ò?Ñ? ÐºÐ¾Ð´Ñ?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ó¨Ð·Ð³ÐµÑ?Ñ?Ñ?Ñ?ÐµÑ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ñ?"
 
@@ -102,7 +106,8 @@ msgstr "Ð?Ò±Ð» QRCode Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ð½ Ò?Ð°Ð¼Ñ?Ð¸Ð´Ñ?.
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð½Ð´Ð° Ò?Ð°Ð·Ñ?Ñ?Ð³Ñ? ÐºÐµÐ·Ð´Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð¶Ð¾Ò? ..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr "%s Tor Browser %s Ð¶Ò¯ÐºÑ?ÐµÑ?"
 msgid "Step %s2%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? %s Ð°Ð»Ñ?"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ò?Ð°Ð´Ð°Ð¼ %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð?Ð½Ð´Ñ? %s Tor Brouser-Ð³Ðµ  ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ò?Ð¾Ñ?Ñ? %s"
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð¼Ð°Ò?Ð°Ð½ Ð±ÐµÑ?Ñ?Ò£Ñ?Ð·! "
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð¢Ð¾Ð»Ñ?Ò? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ð¾Ò?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð?Ð¾Ò?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses! "
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Ð?Ó©Ð¿Ñ?Ñ? "
@@ -215,7 +222,7 @@ msgstr "Ó?Ð¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð¡Ó?Ð»ÐµÐ¼, Ð´Ð¾Ñ?Ñ?Ð¼!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ñ?Ò? ÐºÑ?Ð»Ñ?Ñ?ÐµÑ?"
 
@@ -290,47 +297,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?ÐµÐ½Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð¼ Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¼ÐµÐ¹Ð´Ñ?! Ð?Ó©Ð¼ÐµÐº Ò?Ð°Ð¶ÐµÑ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ðµ Ñ?Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ? Ð¶ÐµÐ»Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ð°Ð»Ñ?Ò£Ñ?Ð·!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ? Ñ?Ò¯Ñ?Ñ?Ð½Ñ?Ò£ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ð°Ò£Ð´Ð°Ò£Ñ?Ð·:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð¡Ñ?Ð·Ð³Ðµ IPv6 Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ð»Ð°Ñ?Ñ? ÐºÐµÑ?ÐµÐº Ð¿Ðµ?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s Ñ?Ñ?Ð·Ð³Ðµ Ò?Ð°Ð¶ÐµÑ?Ð¿Ðµ?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ?Ò£Ñ?Ð· Ð´Ò±Ñ?Ñ?Ñ? Ð±ÐµÐ¹Ð½ÐµÐ½Ñ? ÐºÓ©Ñ?Ñ?ÐµÑ?Ð¿ÐµÐ¹Ð´Ñ?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð¾Ò?Ð°Ñ?Ñ?Ð´Ð°Ò?Ñ? Ñ?Ñ?Ñ?ÐµÑ?Ñ?ÐµÐ³Ñ? Ñ?Ð°Ò£Ð±Ð°Ð»Ð°Ñ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ?Ò£Ñ?Ð· ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð¡Ñ?Ð·Ð´Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ò£Ñ?Ð·Ð´Ñ? Ò?Ð°Ð»Ð°Ð¹ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ?Ò?Ð° Ð±Ð¾Ð»Ð°Ð´Ñ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,21 @@ msgid ""
 msgstr "Tor Browser-Ð³Ðµ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐµÐ½Ð³Ñ?Ð·Ñ? Ò¯Ñ?Ñ?Ð½, Ð±Ñ?Ñ?Ñ?Ð½Ñ?Ñ? Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ %sTor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·\n %sÐ¶Ó?Ð½Ðµ Ð¾Ñ?Ñ? Ð¶ÐµÑ?Ð´ÐµÐ½ Ð½Ò±Ñ?Ò?Ð°Ñ?Ð»Ñ?Ò?Ñ?Ñ? Ð¾Ò?Ñ?Ð¿ Tor Browser-Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ Ð?Ð?Ð¡Ð¢Ð?Ò¢Ð«Ð?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Ð?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ñ?Ð°Ò£Ð´Ð°Ð¿, 'Ð?ÐµÐ»ÐµÑ?Ñ?' Ð´ÐµÐ³ÐµÐ½Ð´Ñ? Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·. Ð?Ð°Ò£Ð° ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð»Ð°Ñ?, ÐºÓ©Ñ?Ñ?Ñ?Ñ? Ð¶Ó?Ð½Ðµ\nÐºÓ©Ð¿Ñ?Ñ? Ð¶Ð¾Ð»Ð´Ð°Ñ?Ñ?Ð½ Ð¼Ó?Ñ?Ñ?Ð½ ÐµÐ½Ð³Ñ?Ð·Ñ? Ð¶Ð¾Ð»Ð°Ò?Ñ?Ð½Ð° Ò?Ð¾Ð¹Ñ?Ò£Ñ?Ð·. Ð¡Ð¾Ò£Ñ?Ð½Ð´Ð°, Â«Ò?Ð¾Ñ?Ñ?Ð»Ñ?Â» Ñ?Ò¯Ð¹Ð¼ÐµÑ?Ñ?Ð³Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·.\nÐ?Ð³ÐµÑ? Ñ?Ñ?Ð·Ð´Ðµ Ò?Ð¸Ñ?Ð½Ð´Ñ?Ò?Ñ?Ð°Ñ? Ñ?Ñ?Ñ?Ð½Ð´Ð°Ñ?Ð°, Â«Ð?Ð½Ñ?Ò?Ñ?Ð°Ð¼Ð°Â» Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð· Ð¶Ó?Ð½Ðµ\nÒ?Ð¾Ñ?Ñ?Ð¼Ñ?Ð° ÐºÓ©Ð¼ÐµÐº Ð°Ð»Ñ? Ò¯Ñ?Ñ?Ð½ Â«Tor Network SettingsÂ» Ð±Ð°Ñ?Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð½ Ð±Ð°Ñ?Ñ?Ò£Ñ?Ð·"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð½Ð¸Ð»Ñ?Ð´Ñ? ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ð´Ñ? Ñ?Ò±Ñ?Ð°Ñ?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð½ Ñ?Ò±Ñ?Ð°Ñ?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE Ð±Ð¾Ð¹Ñ?Ð½Ñ?Ð° Ð±Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ð»Ð³ÐµÐ½ Ñ?Ð°Ñ?Ñ?Ð¼Ð°Ð»Ð´Ñ? Ñ?Ò±Ñ?Ð°Ò£Ñ?Ð·."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 5dab45671..5b5851ed3 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: Seavmeng Samoeurth <seavmengs@xxxxxxxxxx>\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"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»á??â??á??á?¶á??á?½á??â??á??á??á??á?¾â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á?¶á??á?¶"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "á??á?¼á??â??á??á??á??á??á??"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Changelog"
 
@@ -104,7 +108,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "á??á??á? á?¶á?? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "á??á??á? á?¶á?? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser %s"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "á??á??"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "á??á??á??á?¶á??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
@@ -217,7 +224,7 @@ msgstr "á? á??, %s!"
 msgid "Hello, friend!"
 msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
 
@@ -292,47 +299,50 @@ msgstr "Another way to get bridges is to send an email to %s. Please note that y
 msgid "My bridges don't work! I need help!"
 msgstr "á??á??á??á??á?¸á??á??á??â??â??á??á??á??á??â??á??á??á??á?»á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??! á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á??á??á?½á??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "á??á??á??â??á??á?¶â??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "á??á??á?½á??â??á??á??â??á??á??á??á??á?¸á??á??á??!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á?¼á??á??á??á??á?¶á??á??"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á?? IPv6 á??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??â??á?¢á?¶á??â??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á??á?? TYPE á??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 5828df480..b6669dcdc 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: Johnny Cho <popeye92@xxxxxxxxx>\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"
@@ -52,8 +52,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -67,19 +67,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? ë¬´ì?¸ê°? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ì?¸ì?´"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ë²?ê·¸ë¥¼ ë³´ê³ í??ê¸°"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ì??ì?¤ ì½?ë??"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "ë³?ê²½ ê¸°ë¡?"
 
@@ -118,7 +122,8 @@ msgstr "ì?´ QRì½?ë??ë?? ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ì?? í?¬í?¨í??ê³  ì??ì?µë??ë?¤. 
 msgid "There currently aren't any bridges available..."
 msgstr "í??ì?¬ ì?¬ì?©í?  ì?? ì??ë?? ë¸?ë¦¿ì§?ê°? ì??ì?µë??ë?¤..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -140,17 +145,19 @@ msgstr "%s Tor ë¸?ë?¼ì?°ì ? %së¥¼ ë?¤ì?´ë°?ì?µë??ë?¤ "
 msgid "Step %s2%s"
 msgstr "%s2%së?¨ê³? "
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ë¸?ë¦¿ì§? %së¥¼ ê°?ì ¸ì?µë??ë?¤"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%së?¨ê³? "
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
@@ -159,27 +166,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sê·¸%së?¥ ë¸?ë¦¿ì§? ì£¼ì?¸ì??!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "ê³ ê¸? ì?µì??"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ì??ì??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%së?¤!%s"
@@ -187,7 +194,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%së¸?%së¦¿ì§? ì?»ê¸°"
@@ -231,7 +238,7 @@ msgstr "ì ?ê¸°, %sì?¼! "
 msgid "Hello, friend!"
 msgstr "ì??ë?? ì¹?êµ¬!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "ê³µê°? í?¤"
 
@@ -306,47 +313,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "ë¸?ë¦¿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ë?¤ì?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?¼ì?¸ì??!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "ë¸?ë¦¿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? ê³¨ë?¼ ì£¼ì?¸ì??:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ì£¼ì??ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ê°? í??ì??í?©ë??ê¹??"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? ëª»í?©ë??ë?¤."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "ì?? ê·¸ë¦¼ì?? ë¬¸ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?¬ì?©í??ë?? ë°©ë²?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +365,21 @@ msgid ""
 msgstr "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?ë¦¬ì§?ë¥¼ ì??ë ¥í??ë ¤ë©´ ë¨¼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?ì¹¨ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -377,28 +387,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??ë¥´ì?  í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ ì£¼ì?¸ì??.\në¸?ë¦¿ì§?ë¥¼ ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì?  ë¸?ë¦¿ì§?ë¥¼ í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì?  ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'ë¥¼ ë??ë?¬ ì£¼ì??ë©´ ì??ë??ë?  ê²?ì??ë??ë?¤!\në§?ì?½ ë¬¸ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "ì?¼ë°? ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ì?½ì??í?? ì?¥ì¹?ë¥¼ TYPEë¥¼ í?µí?´ì?? ì??ì²í??ì?¸ì??."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 b9e709d9a..aab85ae40 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 15:57+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Atleiskite! KaÅ¾kas nutiko su jÅ«sÅ³ uÅ¾klausa."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kalba"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "PraneÅ¡ti apie klaidÄ?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Pirminis kodas"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "KeitiniÅ³ Å¾urnalas"
 
@@ -107,7 +111,8 @@ msgstr "Å iame QR kode yra jÅ«sÅ³ tinklÅ³ tilto linijos. Nuskenuokite Å¡Ä¯ kodÄ?
 msgid "There currently aren't any bridges available..."
 msgstr "Å iuo metu nÄ?ra prieinami jokie tinklÅ³ tiltai..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "AtsisiÅ³skite %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "%s2%s Å¾ingsnis "
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Gaukite %s tinklÅ³ tiltus %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s Å¾ingsnis "
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Dabar, %s pridÄ?kite tinklÅ³ tiltus Ä¯ Tor Browser %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%siesiog suteikite man tinklÅ³ tiltus!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "IÅ¡plÄ?stiniai parametrai"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nÄ?ra"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%saip!"
@@ -176,7 +183,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%sauti tinklÅ³ tiltus"
@@ -220,7 +227,7 @@ msgstr "Sveiki, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiki!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VieÅ¡ieji raktai"
 
@@ -295,47 +302,50 @@ msgstr "Kitas bÅ«das gauti tinklÅ³ tiltus yra siusti el. laiÅ¡kÄ? Ä¯ %s. TurÄ?ki
 msgid "My bridges don't work! I need help!"
 msgstr "Mano tinklÅ³ tiltai neveikia! Man reikia pagalbos!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Jeigu jÅ«sÅ³ Tor negali prisijungti, paÅ¾iÅ«rÄ?kite Ä¯ %s ir mÅ«sÅ³ %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Å tai jÅ«sÅ³ tinklÅ³ tilto linijos:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Gauti tinklÅ³ tiltus!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "PraÅ¡ome paÅ¾ymÄ?ti tinklÅ³ tilto tipo parametrus:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ar jums reikia IPv6 adresÅ³?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ar jums reikia %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«sÅ³ narÅ¡yklÄ? netinkamai atvaizduoja paveikslus."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ä®veskite simbolius iÅ¡ aukÅ¡Ä?iau esanÄ?io paveikslo..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kaip pradÄ?ti naudotis tinklÅ³ tiltais"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "UÅ¾klausti paprastÅ³ tinklÅ³ tiltÅ³."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "UÅ¾klausti IPv6 tinklÅ³ tiltÅ³."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 171b59fe3..1b396937e 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Atvainojiet! Notikusi ar JÅ«su pieprasÄ«jumu saistÄ«ta kÄ¼Å«me."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Valoda"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ZiÅ?ot par kÄ¼Å«du"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Pirmkods"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "IzmaiÅ?u Å¾urnÄ?ls"
 
@@ -102,7 +106,8 @@ msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ?jiet to ar QRCode lasÄ«tÄ?ju, lai ie
 msgid "There currently aren't any bridges available..."
 msgstr "Å obrÄ«d nav pieejamu tiltu..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr "LejuplÄ?dÄ?t %s PÄ?rlÅ«ku Tor %s"
 msgid "Step %s2%s"
 msgstr "Solis %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "SaÅ?emt %s tiltus %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Solis %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sT%sikai dodiet man tiltus!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "LietpratÄ?ju opcijas "
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÄ?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nekas"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sÄ?!"
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sS%saÅ?emt tiltus"
@@ -215,7 +222,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiks, draug!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "PubliskÄ?s atslÄ?gas"
 
@@ -290,47 +297,50 @@ msgstr "VÄ?l cits veids kÄ? saÅ?emt tiltu sarakstus ir nosÅ«tÄ«t e-pastu uz %s.
 msgid "My bridges don't work! I need help!"
 msgstr "Mani tilti nestrÄ?dÄ?! Man nepiecieÅ¡ama palÄ«dzÄ«ba!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Te ir JÅ«su tiltu lÄ«nijas:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "SaÅ?emt Tiltus!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Vai ir nepiecieÅ¡amas IPv6 adreses?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Vai ir nepiecieÅ¡ams %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "PieprasÄ«t parastos tiltus."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "PieprasÄ«t IPv6 tiltus."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 17d7510af..28b3f2bb7 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 14:44+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: Liljana Ackovska <liljanagjurova@xxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½ÐµÑ?Ðµ! Ð¡Ðµ Ñ?Ð»Ñ?Ñ?Ð¸ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð¾ Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð±Ð°Ñ?Ð°Ñ?Ðµ."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð°Ð·Ð¸Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?ÐµÐ½ ÐºÐ¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð?Ð¾Ð³ Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
@@ -103,7 +107,8 @@ msgstr "Ð?Ð²Ð¾Ñ? QR ÐºÐ¾Ð´ Ð³Ð¸ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð§ÐµÐºÐ¾Ñ? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð´Ð°Ñ? Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½Ð¸Ñ?Ñ?Ð¾"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
@@ -172,7 +179,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
@@ -216,7 +223,7 @@ msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ»Ñ?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¸"
 
@@ -291,47 +298,50 @@ msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ðµ Ð´Ð° Ð¸Ñ?Ð¿Ñ?
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐ½Ñ?Ð¸Ð¸:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð·Ð° Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð»Ð¸ Ñ?Ð¸ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ð½Ðµ Ð³Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ñ?Ð»Ð¸ÐºÐ¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð½ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ ÐºÐ°Ñ?Ð°ÐºÑ?ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´ Ñ?Ð»Ð¸ÐºÐ°Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ñ?Ðµ:"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,21 @@ msgid ""
 msgstr "Ð?Ð° Ð²Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Tor Browser, Ð¿Ñ?Ð²Ð¾ Ð¾Ð´ÐµÑ?Ðµ Ð½Ð° %s Tor Browser Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ\nÑ?Ñ?Ñ?Ð°Ð½Ð°Ñ?Ð° %s Ð¸ Ð¿Ð¾Ñ?Ð¾Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð¡Ð»ÐµÐ´Ð½Ð¾'. Ð?Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ·Ð°Ð»ÐµÐ¿ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð¾Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ð»ÐµÑ?Ð¾. Ð?Ð° ÐºÑ?Ð°Ñ? ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð¾Ð²Ñ?Ð·Ð¸', Ð¸\nÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ñ?Ðµ Ñ?Ð¾ ÐºÐ»Ð¸ÐºÐ°Ñ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÐºÐ¾Ð¿Ñ?ÐµÑ?Ð¾ Ð²Ð¾ 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° IPv6 Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 fdfa1d593..2ec29748c 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-14 01:31+0000\n"
-"Last-Translator: ameer pb <ameerpbekm@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à´?àµ?à´·à´®à´¿à´?àµ?à´?àµ?! à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?à´¯àµ¼à´¤àµ?à´¥à´¨à´¯à´¿àµ½ à´¤àµ?à´±àµ?à´±àµ?à´£àµ?à´?àµ? "
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à´?à´°àµ? à´¬à´?àµ? à´±à´¿à´ªàµ?à´ªàµ?à´¾àµ¼à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¯àµ?à´?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à´¸àµ?à´¾à´´àµ?à´¸àµ? à´?àµ?à´¾à´¡àµ?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à´®à´¾à´±àµ?à´± à´µà´¿à´µà´°à´ªàµ?à´ªà´?àµ?à´?à´¿à´? "
 
@@ -104,7 +108,8 @@ msgstr "à´?àµ? QR à´?àµ?à´¡à´¿àµ½ à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?
 msgid "There currently aren't any bridges available..."
 msgstr "à´¤àµ½à´¸à´®à´¯à´? à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´? à´²à´àµ?à´¯à´®à´²àµ?à´²."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ %s  à´¡àµ?àµºà´²àµ?à´¡àµ? à´?àµ?à´¯àµ?à´¯
 msgid "Step %s2%s"
 msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à´¸àµ?à´±àµ?à´±àµ?à´ªàµ? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à´?à´¨à´¿ à´?à´°àµ? à´¶à´¤à´®à´¾à´¨à´? %s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ?à´±à´¿ à´²àµ?à´?àµ? à´?àµ?à´?àµ?à´?à´¿à´?àµ?à´?àµ?àµ¼à´?àµ?à´?àµ?à´? %s"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¤à´°àµ?à´? %sÂ "
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à´?àµ?à´?àµ?à´¤àµ½ à´?àµ?à´°à´®àµ?à´?à´°à´£à´?àµ?à´?àµ¾ "
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à´µàµ?à´£àµ?à´?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à´?à´¨àµ?à´¨àµ?à´®à´¿à´²àµ?à´²"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%s à´¶àµ?à´°à´¿  %s "
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´?àµ?à´?àµ?à´?àµ?à´? %s "
@@ -217,7 +224,7 @@ msgstr "à´¨à´®à´¸àµ?à´?à´¾à´°à´? ! %s"
 msgid "Hello, friend!"
 msgstr "à´¨à´®à´¸àµ?à´?à´¾à´°à´? à´¸àµ?à´¹àµ?à´¤àµ?à´¤àµ? !"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à´ªàµ?à´¤àµ?à´µà´¾à´¯ à´¤à´¾à´?àµ?à´?àµ?àµ½ à´?àµ?à´?àµ?à´?à´?àµ?à´?àµ¾ "
 
@@ -292,47 +299,50 @@ msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´¿à´?àµ?à´?à´¾àµ» à´®à´±àµ?à´±àµ?à´°
 msgid "My bridges don't work! I need help!"
 msgstr "à´?à´¨àµ?à´±àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´² ! à´?à´¨à´¿à´?àµ?à´?àµ? à´¸à´¹à´¾à´¯à´? à´?à´µà´¶àµ?à´¯à´®à´¾à´£àµ? !"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´±àµ?à´±àµ?à´±à´¿à´¨àµ? à´¬à´¨àµ?à´§à´ªàµ?à´ªàµ?à´?à´¾àµ» à´¸à´¾à´§à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´²àµ?à´?àµ?à´?à´¿àµ½ , à´¦à´¯à´µà´¾à´¯à´¿ %sà´?à´?àµ?à´?à´³àµ?à´?àµ? à´¨àµ?à´?àµ?à´?àµ?à´? %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à´?à´¤à´¾à´£àµ? à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?à´³àµ?à´?àµ? à´ªà´?àµ?à´?à´¿à´? :"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "à´¦à´¯à´µà´¾à´¯à´¿ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´?à´àµ?à´¦à´?àµ?à´?àµ¾ à´¤à´¿à´°à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? :"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´? à´ªà´¿ à´µà´¿ 6 à´®àµ?àµ½à´µà´¿à´²à´¾à´¸à´? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ??"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à´¨à´¿à´?àµ?à´?àµ¾à´?àµ? à´?à´°àµ? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´¿à´¤àµ?à´°à´?àµ?à´?àµ¾ à´µàµ?à´£àµ?à´? à´°àµ?à´¤à´¿à´¯à´¿àµ½ à´ªàµ?à´°à´¦à´°àµ?à´¶à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´² ."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr " à´®àµ?à´?à´³à´¿àµ½ à´?à´¾à´£àµ?à´¨àµ?à´¨ à´?à´¿à´¤àµ?à´°à´¤àµ?à´¤à´¿àµ½ à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´?àµ?à´·à´°à´?àµ?à´?àµ¾ à´?àµ?àµ¼à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à´?à´?àµ?à´?à´¨àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ? à´¤àµ?à´?à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,21 @@ msgid ""
 msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ?à´°à´¿à´²àµ?à´?àµ?à´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?àµ?àµ¼à´?àµ?à´?à´£à´®àµ?à´?àµ?à´?à´¿àµ½ , à´?à´¦àµ?à´¯à´? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´±à´?àµ?à´?à´¿à´µàµ?à´?àµ?à´?àµ?à´¨àµ?à´¨ %s à´µàµ?à´¬àµ? à´¸àµ?à´±àµ?à´±à´¿à´²àµ?à´?àµ? à´ªàµ?à´?àµ?à´? \n%s à´?à´¨àµ?à´¨à´¿à´?àµ? à´?à´µà´¿à´?àµ? à´¨à´¿à´¨àµ?à´¨àµ?à´? à´?à´±à´?àµ?à´?à´¿à´µàµ?à´?àµ?à´?à´¾à´¨àµ?à´? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´¤àµ?à´?à´?àµ?à´?à´¾à´¨àµ?à´®àµ?à´³àµ?à´³ \nà´¨à´¿àµ¼à´¦àµ?à´¶à´?àµ?à´?àµ¾ à´ªà´¿à´¨àµ?à´¤àµ?à´?à´°àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "à´?à´¤àµ? à´?à´¨àµ?à´¨àµ?à´? à´¤àµ?à´?à´°àµ?à´? à´?à´¨àµ?à´¨àµ?à´? à´?à´®àµ¼à´¤àµ?à´¤àµ?à´? . à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?àµ¼ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸à´?àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?à´¾àµ» , \nà´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´°à´¿à´?àµ¾ à´?àµ?à´?àµ?à´¸àµ?à´±àµ?à´±àµ? à´¬àµ?à´?àµ?à´¸à´¿à´²àµ?à´?àµ? à´ªà´?àµ¼à´¤àµ?à´¤àµ?à´?à´¯àµ?à´? à´?à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´?à´¯àµ?à´? à´?àµ?à´¯àµ?à´¯àµ?à´?. à´?à´µà´¸à´¾à´¨à´®à´¾à´¯à´¿ 'à´?à´£à´?àµ?à´?à´¿àµ½' à´?à´®àµ¼à´¤àµ?à´¤àµ?à´?, à´?àµ?à´?à´¾à´¤àµ? \nà´¨à´¿à´?àµ?à´?àµ¾ à´¤à´¯àµ?à´¯à´¾à´±à´¾à´¯à´¿! à´?à´¨à´¿ à´¨à´¿à´?àµ?à´?àµ¾ à´?à´¨àµ?à´¤àµ?à´?àµ?à´?à´¿à´²àµ?à´? à´ªàµ?à´°àµ?à´¶àµ?à´¨à´?àµ?à´?àµ¾ à´?à´à´¿à´®àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? à´?à´£àµ?à´?àµ?à´?à´¿àµ½, à´?àµ?àµ¼ à´¨àµ?à´±àµ?à´±àµ?â??à´µàµ¼à´?àµ?à´?àµ? à´¸àµ?à´±àµ?à´±à´¿à´?à´?àµ?à´¸àµ? \nà´?à´¨àµ?à´¨ à´¸à´¹à´¾à´¯ à´¨à´¿àµ¼à´¦àµ?à´¦àµ?à´¶ à´?à´¾à´²à´?à´¤àµ?à´¤à´¿à´²àµ? à´¹àµ?à´²àµ?à´ªà´¿àµ½ à´?à´®àµ¼à´¤àµ?à´¤àµ?à´? ."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "à´µà´¾à´¨à´¿à´² à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "à´? à´ªà´¿ à´µà´¿ 6 à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?àµ¾ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "à´?à´°àµ? à´ªàµ?à´²à´?àµ?à´?àµ?â??à´¬à´¿àµ¾ à´?àµ?à´°à´¾àµ»à´¸àµ?à´ªàµ?àµ¼à´?àµ? à´°àµ?à´¤à´¿ à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 8b2925d35..284fa29e9 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¤?à¥?à¤·à¤®à¤¸à¥?à¤µ! à¤?à¤¾à¤¹à¥?à¤¤à¤°à¥? à¤?à¥?à¤? à¤?à¤¾à¤²à¥? à¤?à¤¹à¥?"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¤¦à¥?à¤· à¤¨à¥?à¤?à¤¦à¤µà¤¾"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à¤¸à¥?à¤?à¤°à¥?à¤¸ à¤?à¥?à¤¡"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à¤¬à¤¦à¤² à¤²à¥?à¤?"
 
@@ -100,7 +104,8 @@ msgstr "à¤¹à¥?à¤¯à¤¾ QR à¤?à¥?à¤¡ à¤®à¤§à¥?à¤¯à¥? à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°
 msgid "There currently aren't any bridges available..."
 msgstr "à¤¸à¤§à¥?à¤¯à¤¾ à¤?à¥?à¤£à¤¤à¥?à¤¹à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤ªà¤²à¤¬à¥?à¤§ à¤¨à¤¾à¤¹à¥?à¤¤ ... "
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "à¤¡à¤¾à¤?à¤¨à¤²à¥?à¤¡ %s à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° %s"
 msgid "Step %s2%s"
 msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¤ªà¤¾à¤¯à¤°à¥? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¤?à¤¤à¤¾ %s à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¥?à¤° à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤®à¤§à¥?à¤¯à¥? à¤?à¤¾à¤?à¤¾ %s"
@@ -141,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¤®%sà¤²à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤¦à¥?à¤¯à¤¾!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¤ªà¥?à¤°à¤?à¤¤ à¤ªà¤°à¥?à¤¯à¤¾à¤¯"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¤¨à¤¾à¤¹à¥?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¤?à¤¾à¤¹à¥?à¤¹à¥? à¤¨à¤¾à¤¹à¥?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¤¹à¥?%sà¤¯!"
@@ -169,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
@@ -213,7 +220,7 @@ msgstr "à¤?à¤¯, %s!"
 msgid "Hello, friend!"
 msgstr "à¤¹à¥?à¤²à¥?, à¤®à¤¿à¤¤à¥?à¤°à¤¾ !"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¤ªà¤¬à¥?à¤²à¤¿à¤? à¤?à¤¿à¤?à¥?"
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "à¤®à¤¾à¤?à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¾à¤°à¥?à¤¯ à¤?à¤°à¤¤ à¤¨à¤¾à¤¹à¥?! à¤®à¤²à¤¾ à¤®à¤¦à¤¤ à¤¹à¤µà¥? à¤?à¤¹à¥?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à¤?à¤ªà¤²à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤? à¤?à¤³à¥?"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "%s à¤ªà¥?à¤² %s à¤®à¤¿à¤³à¤µà¤¾"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "à¤¬à¥?à¤°à¤¿à¤? à¤ªà¥?à¤°à¤?à¤¾à¤°à¤¾à¤¤à¥?à¤² à¤ªà¤°à¥?à¤¯à¤¾à¤¯ à¤¨à¤¿à¤µà¤¡à¤¾:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à¤?à¤ªà¤£à¤¾à¤¸ IPv6 à¤ªà¤¤à¥?à¤¤à¥? (addresses) à¤¹à¤µà¥? à¤?à¤¹à¥?à¤¤ à¤?à¤¾? "
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¤?à¤ªà¤£à¤¾à¤¸ %s à¤¹à¤µà¥? à¤?à¤¹à¥? à¤?à¤¾?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "à¤?à¤ªà¤²à¤¾ à¤¬à¥?à¤°à¤¾à¤?à¤?à¤° à¤ªà¥?à¤°à¤¤à¤¿à¤®à¤¾ à¤¨à¥?à¤? à¤¦à¤¾à¤?à¤µà¤¤ à¤¨à¤¾à¤¹à¥?. "
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "à¤µà¤°à¥?à¤² à¤ªà¥?à¤°à¤¤à¤¿à¤®à¥?à¤¤à¥?à¤² à¤¶à¤¬à¥?à¤¦ à¤²à¤¿à¤¹à¤¾"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à¤?à¤ªà¤²à¥? à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤?à¤¸à¥? à¤µà¤¾à¤ªà¤°à¤¾à¤µà¥?à¤¤"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "à¤¸à¤§à¥?à¤¯à¤¾ à¤¬à¥?à¤°à¤¿à¤?à¤?à¥? à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 à¤¬à¥?à¤°à¤¿à¤?à¥?à¤¸ à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "à¤ªà¥?à¤²à¤?à¥?à¤¬à¤² à¤?à¥?à¤°à¤¾à¤?à¤¸à¥?à¤ªà¥?à¤°à¥?à¤? TYPE à¤µà¤¿à¤¨à¤?à¤¤à¥?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 133e5a802..f0783414f 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Bahasa"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Lapor kesilapan kod"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kod Sumber"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Sejarah log"
 
@@ -107,7 +111,8 @@ msgstr "QR Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk mem
 msgid "There currently aren't any bridges available..."
 msgstr "Tidak ada alat 'bridge' pada masa ini..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Muat turun%s Pelayar Web Tor %s"
 msgid "Step %s2%s"
 msgstr "Langkah%s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dapatkan %s titi %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Langkah%s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sPilih%s secara automatik 'bridges'!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Pilihan Lanjutan"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Tidak"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "tiada"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%sa!"
@@ -176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%suna Bridges"
@@ -220,7 +227,7 @@ msgstr "Hai, %s!"
 msgid "Hello, friend!"
 msgstr "Hai, kawan!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Kunci Awam"
 
@@ -295,47 +302,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Berikut adalah bridge anda:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Dapat sambungan Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Sila pilih jenis bridge:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Anda perlukan alamat IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Perlukah anda %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Pelayar anda tidak memaparkan imej dengan betul."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Masukkan imej aksara yang tertera..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Bagaimana cara untuk mula mengunakan bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Pinta bridges yang disyorkan."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Pinta IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 9bd32c03c..7aa200063 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-10 19:25+0000\n"
-"Last-Translator: Mats Larsen <sumohd@xxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -43,8 +43,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -58,19 +58,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Innrapporter feil"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Endringslogg"
 
@@ -109,7 +113,8 @@ msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for
 msgid "There currently aren't any bridges available..."
 msgstr "Det er for tiden ingen tilgjengelige broerâ?¦"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -131,17 +136,19 @@ msgstr "Last ned %s Tor-nettleseren %s"
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Tilknytt %s broer %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
@@ -150,27 +157,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare gi meg noen broer!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avanserte valg"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -178,7 +185,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sT%silknytt broer"
@@ -222,7 +229,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, lille venn!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸kler"
 
@@ -297,47 +304,50 @@ msgstr "En annen mÃ¥te Ã¥ tilknytte seg broer pÃ¥ er Ã¥ sende en epost til %s. M
 msgid "My bridges don't work! I need help!"
 msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Hvis din Tor ikke kan koble til, kan du ta en titt pÃ¥ %s og vÃ¥r %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Tilknytt broer!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -346,21 +356,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -368,28 +378,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "EtterspÃ¸r IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 40836202b..dd1e038e5 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-18 16:43+0000\n"
-"Last-Translator: Meteor 0id\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -67,19 +67,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Een bug melden"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Lijst van wijzigingen"
 
@@ -118,7 +122,8 @@ msgstr "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -140,17 +145,19 @@ msgstr "Download %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Download %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
@@ -159,27 +166,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -187,7 +194,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%srijg Bridges"
@@ -231,7 +238,7 @@ msgstr "Hoi, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Publieke Sleutels"
 
@@ -306,47 +313,50 @@ msgstr "Een andere manier om bridges te bemachtigen is door een e-mail te sturen
 msgid "My bridges don't work! I need help!"
 msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Als uw Tor Browser geen verbinding kan maken, bekijk dan de %s en onze %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn je bridge regels:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Krijg Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Selecteer opties voor bridge type:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Heb je IPv6 adressen nodig?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heb je een %s nodig?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Voer de tekens in van de bovenstaande afbeelding..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +365,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -377,28 +387,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Vraag vanilla bridges aan."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Verzoek IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 1f3b356fd..bfccff389 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporteer een Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Changelog"
 
@@ -100,7 +104,8 @@ msgstr "Deze QRCode bevat uw bridge lines. Scan deze aub met een QRCode lezer om
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar. "
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "Download %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Stap %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Verkrijg %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Stap %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sG%seef me gewoon bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Geavanceerde Opties"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nee"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -169,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sV%serkrijg Bridges"
@@ -213,7 +220,7 @@ msgstr "Hallo, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn uw bridge lines:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Verkrijg Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Gelieve opties te selecteren voor bridge type:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Heeft u IPv6 adressen nodig?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heeft u een %s nodig?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser geeft afbeeldingen niet correct weer."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Voer de karakters van de afbeelding hierboven in..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Hoe beginnen met bridges te gebruiken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Vraag standaard bridges aan."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Vraag IPv6 bridges aan."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 cd1710bff..fac1e8557 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -35,8 +35,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -50,19 +50,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Orsak! Noko gjekk gale med fÃ¸respurnaden din."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporter feil"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kjeldekode"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Endringslogg"
 
@@ -101,7 +105,8 @@ msgstr "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for
 msgid "There currently aren't any bridges available..."
 msgstr "Ingen bruer er for tida tilgjengelege "
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -123,17 +128,19 @@ msgstr "Last ned %s Tor-nettlesaren %s"
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Hent %s bruer %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "No kan du %s leggja til bruene i Tor Browser %s"
@@ -142,27 +149,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%serre gje meg nokre bruer!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avanserte innstillingar"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nei"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -170,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%snyt til bruer"
@@ -214,7 +221,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo, ven!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Offentlege nÃ¸klar"
 
@@ -289,47 +296,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Brua mi verkar ikkje! Eg treng hjelp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Her er bru-linene dine:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "FÃ¥ bruer!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ver venleg og gjer val for brutype:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Treng du IPv6-adresser?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Treng du %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Nettlesaren din viser ikkje bilete skikeleg."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn teikn frÃ¥ biletet nedanfor "
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Korleis starta Ã¥ bruka bruer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +348,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +370,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Be om bruer med fabrikkoppsett."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Be om IPv6-bruer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 dc59dcdb0..73b1f8f17 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¨?à¨«à¨¼à¨¸à©?à¨¸ à¨¹à©? à¨?à¨¿ à¨¤à©?à¨¹à¨¾à¨¡à©? à¨¬à©?à¨¨à¨¤à©? à¨µà¨¿à¨? à¨?à©?à¨? à¨?à¨²à¨¤ à¨¹à©? à¨?à¨¿à¨? à¨¹à©? |"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¨?à©±à¨? à¨¬à©±à¨? à¨¦à©? à¨°à¨¿à¨ªà©?à¨°à¨? à¨?à¨°à©? |"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à¨¸à¨°à©?à¨¤ à¨?à©?à¨¡ |"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à¨²à¨¾à¨? à¨¬à¨¦à¨²à©?"
 
@@ -102,7 +106,8 @@ msgstr "à¨?à¨¸ QRCode à¨µà¨¿à©±à¨? à¨¤à©?à¨¹à¨¾à¨¡à©?à¨?à¨? à¨¬à©?à¨°à¨¿à¨? à¨²
 msgid "There currently aren't any bridges available..."
 msgstr "à¨?à¨¸ à¨µà©?à¨²à©? à¨?à©?à¨? à¨µà©? à¨ªà©?à¨² à¨?à¨ªà¨²à¨¬à©±à¨§ à¨¨à¨¹à©?à¨? à¨¹à©? ..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr "à¨¡à¨¾à¨?à¨¨à¨²à©?à¨¡ %s à¨?à©?à¨° à¨¬à©?à¨°à¨¾à¨?à©?à¨° %s"
 msgid "Step %s2%s"
 msgstr "à¨?à¨¦à¨® %s 2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¨ªà©?à¨² %s à¨²à¨µà©? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¨?à¨¦à¨® %s 3 %s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¨¨à¨¹à©?à¨?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -215,7 +222,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¨ªà¨¬à¨²à¨¿à¨? à¨?à©?à©°à¨?à©?"
 
@@ -290,47 +297,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 096f6447f..94bc626b6 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 20:30+0000\n"
-"Last-Translator: Konrad Wila <360kon@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -44,8 +44,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -59,19 +59,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "JÄ?zyk"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ZgÅ?oÅ? BÅ?Ä?d"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kod ÅºrÃ³dÅ?owy"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Lista zmian"
 
@@ -110,7 +114,8 @@ msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodÃ³w QR
 msgid "There currently aren't any bridges available..."
 msgstr "Aktualnie nie ma dostÄ?pnych Å¼adnych mostÃ³w..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -132,17 +137,19 @@ msgstr "Pobierz %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Pobierz %s mostki %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s dodaj mosty do Tor Browser %s"
@@ -151,27 +158,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sP%so prostu daj mi mosty!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opcje zaawansowane"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "brak"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sT%sak!"
@@ -179,7 +186,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sP%sozyskaj mosty"
@@ -223,7 +230,7 @@ msgstr "Witaj, %s!"
 msgid "Hello, friend!"
 msgstr "Witaj przyjacielu!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Klucze Publiczne"
 
@@ -298,47 +305,50 @@ msgstr "Innym sposobem uzyskania bridges jest wysÅ?anie e-maila do %s. ProszÄ? p
 msgid "My bridges don't work! I need help!"
 msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "JeÅ¼eli Tor nie moÅ¼e podÅ?Ä?czyÄ? proszÄ? zobaczyÄ? na %s i nasze 1%s"
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Oto Twoje poÅ?Ä?czenia z wykorzystaniem mostÃ³w:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ZdobÄ?dÅº Mosty!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Czy potrzebujesz adresÃ³w IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Czy potrzebujesz %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazÃ³w prawidÅ?owo."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "WprowadÅº tekst z obrazka powyÅ¼ej..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Jak zaczÄ?Ä? uÅ¼ywaÄ? mostÃ³w"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +357,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +379,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "PoproÅ? o regularne mosty."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "PoproÅ? o mosty IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 dd58d067d..9d5e4b823 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -25,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 22:52+0000\n"
-"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -51,8 +51,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -66,19 +66,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Algo errado ocorreu com a sua solicitaÃ§Ã£o."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Relatar um Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo Fonte:"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Registro de alteraÃ§Ãµes"
 
@@ -117,7 +121,8 @@ msgstr "Este CÃ³digo QR contÃ©m as suas pontes de conexÃ£o. Escaneie com um leit
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente nÃ£o hÃ¡ nenhuma ponte disponÃvel..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -139,17 +144,19 @@ msgstr "Fazer download do %s Navegador Tor %s"
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
@@ -158,27 +165,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sA%spenas me dÃª pontes!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -186,7 +193,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sObter%s Bridges"
@@ -230,7 +237,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
@@ -305,47 +312,50 @@ msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lem
 msgid "My bridges don't work! I need help!"
 msgstr "Minhas pontes nÃ£o funcionam!  Preciso de ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Se o seu Tor nÃ£o puder se conectar, dÃª uma olhada no %s e nosso %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas pontes de conexÃ£o:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Obtenha Pontes!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes de tipos de pontes:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "VocÃª precisa de endereÃ§os IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "VocÃª precisa de %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Seu navegador nÃ£o estÃ¡ mostrando as imagens corretamente."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Digite os caracteres da imagem acima..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +364,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +386,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Solicitar pontes simples."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Solicitar pontes IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 a5eeac440..10960a981 100644
--- a/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/pt_PT/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-08 16:59+0000\n"
-"Last-Translator: Hugo9191 <hugoncosta@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -39,8 +39,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -54,19 +54,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Comunicar um Erro"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "CÃ³digo Fonte"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Registo de alteraÃ§Ãµes"
 
@@ -105,7 +109,8 @@ msgstr "Este CÃ³digo QR contÃ©m as suas linhas de ponte. Digitalize-as com um le
 msgid "There currently aren't any bridges available..."
 msgstr "Atualmente, nÃ£o existem pontes disponÃveis..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -127,17 +132,19 @@ msgstr "Transferir %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Passo %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Obter %s pontes %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Passo %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
@@ -146,27 +153,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sisponibilizem-me apenas as pontes!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÃ§Ãµes AvanÃ§adas"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "NÃ£o"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "nenhum"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sim!"
@@ -174,7 +181,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbter Pontes"
@@ -218,7 +225,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
@@ -293,47 +300,50 @@ msgstr "Outra forma de obter pontes, Ã© enviar uma mensagem para %s. Por favor,
 msgid "My bridges don't work! I need help!"
 msgstr "As minhas pontes nÃ£o funcionam! Eu preciso de ajuda!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Se o seu Tor nÃ£o se conseguir conectar, por favor veja %s e o nosso %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas linhas de ponte:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Obter Pontes!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes para o tipo de ponte:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Precisa de endereÃ§os de IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Precisa de %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "O seu navegador nÃ£o estÃ¡ a exibir as imagens devidamente."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Insira os carateres da imagem acima..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +352,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +374,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Solicite as pontes bÃ¡sicas."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Solicite as pontes de IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 31961908c..3b4f0cfd7 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 15:16+0000\n"
-"Last-Translator: eduard pintilie <eduard.pintilie@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -43,8 +43,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -58,19 +58,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Scuze ! Ceva n-a mers cum trebuie!"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "LimbÄ?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "RaporteazÄ? un bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Cod sursÄ?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "SchimbÄ?ri"
 
@@ -109,7 +113,8 @@ msgstr "Codul QR conÈ?ine punÈ?ile tale. ScaneazÄ?-l cu un cititor de coduri QR
 msgid "There currently aren't any bridges available..."
 msgstr "Pe moment nu existÄ? punÈ?i disponibile..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -131,17 +136,19 @@ msgstr "DescarcÄ? %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Pasul %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ObÈ?ine %s punÈ?i %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Pasul %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
@@ -150,27 +157,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "OpÈ?iuni avansate"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nu"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niciunul/niciuna"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sD%sa!"
@@ -178,7 +185,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sbÈ?ine Bridges"
@@ -222,7 +229,7 @@ msgstr "BunÄ? , %s!"
 msgid "Hello, friend!"
 msgstr "BunÄ?, prietene!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Chei publice"
 
@@ -297,47 +304,50 @@ msgstr "Alt mod de a obÈ?ine punÈ?i este sÄ? trimiteÈ?i un email la %s. ReÈ?ine
 msgid "My bridges don't work! I need help!"
 msgstr "PunÈ?ile mele nu funcÈ?ioneazÄ?! Am nevoie de ajutor!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "DacÄ? Tor nu se poate conecta, uitaÈ?i-vÄ? la %s È?i la %s nostru."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Acestea sunt liniile tale de punÈ?i:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ObÈ?ine punÈ?i!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Alege opÈ?iunile pentru tipul de punte:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ai nevoie de adrese IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ai nevoie de %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Introdu caracterele din imaginea de mai sus..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -346,21 +356,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -368,28 +378,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Cere punÈ?i simple."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Cere punÈ?i IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 81d746326..b6409b325 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -31,9 +31,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-18 01:48+0000\n"
-"Last-Translator: Sergey Smirnov <cj75300@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -57,8 +57,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -72,19 +72,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð§Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ñ? Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð¼."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð¯Ð·Ñ?Ðº"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð?Ñ?Ñ?Ð½Ð°Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
 
@@ -123,7 +127,8 @@ msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾
 msgid "There currently aren't any bridges available..."
 msgstr "Ð?Ð° Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -145,17 +150,19 @@ msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð¹Ñ?Ðµ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Ð¨Ð°Ð³ %sâ??2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ñ? %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð¨Ð°Ð³ %sâ??3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð?Ð°Ñ?ÐµÐ¼ %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser %s"
@@ -164,27 +171,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?ÐµÑ?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ?%sÐ°! "
@@ -192,7 +199,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²%s"
@@ -236,7 +243,7 @@ msgstr "ÐÐ¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹, Ð´Ñ?Ñ?Ð³!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸"
 
@@ -311,47 +318,50 @@ msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?Ðµ
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð¼! Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Ð?Ñ?Ð»Ð¸ Tor Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð¸Ñ?Ðµ %s Ð¸ %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð¡Ñ?Ñ?Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?Ð°:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð´ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -360,21 +370,21 @@ msgid ""
 msgstr "Ð§Ñ?Ð¾Ð±Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ð¹ Ð¼Ð¾Ñ?Ñ? Ð² %s Tor Browser, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Tor Browser %s Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ð¿Ð¾ Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ð½Ð¸Ñ? Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -382,28 +392,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ð»ÐµÐµ'. Ð?Ð»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð²Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¸\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²Ð¾Ð´Ð° Ñ?ÐµÐºÑ?Ñ?Ð°. Ð? Ð½Ð°Ð¶Ð¸Ð¼Ð°ÐµÑ?Ðµ 'Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?'! Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼, Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ 'Ð?Ð¾Ð¼Ð¾Ñ?Ñ?'\nÐ²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor' Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¾Ð¹ IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 6060f987d..66b09860d 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-13 09:52+0000\n"
-"Last-Translator: MatÃºÅ¡ <mato699@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,8 +40,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -55,19 +55,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "PrepÃ¡Ä?te! Pri spracovanÃ vaÅ¡ej poÅ¾iadavky sa vyskytla chyba."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "NahlÃ¡siÅ¥ chybu"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "PoslednÃ© zmeny"
 
@@ -106,7 +110,8 @@ msgstr "Tento QR kÃ³d obsahuje vaÅ¡e prehostenia. MoÅ¾ete ho zoskenovaÅ¥ Ä?Ãta
 msgid "There currently aren't any bridges available..."
 msgstr "PrÃ¡ve niesÃº dostupnÃ© Å¾iadne premostenia..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -128,17 +133,19 @@ msgstr "StiahnuÅ¥ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Krok %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ZÃskajte %s premostenia %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Krok %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
@@ -147,27 +154,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sL%sen mi zobrazte premostenia!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "PokroÄ?ilÃ© moÅ¾nosti"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nie"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Å¾iadne"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÃ?%sno!"
@@ -175,7 +182,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sN%sastaviÅ¥ Bridges"
@@ -219,7 +226,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Ahoj, priateÄ¾!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
 
@@ -294,47 +301,50 @@ msgstr "Ä?alÅ¡Ã spÃ´sob ako zÃskaÅ¥ premostenie je poslaÅ¥ e-mail na %s.\nPros
 msgid "My bridges don't work! I need help!"
 msgstr "Moje premostenia nefungujÃº! Potrebujem pomoc!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Ak sa Tor nemÃ´Å¾ete pripojiÅ¥,  skÃºste sa pozrieÅ¥ na %s a na naÅ¡u %s. "
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "ZÃskaÅ¥ premostenia!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "ProsÃm vyberte si moÅ¾nosti na typ premostenia:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 adresy?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prehliadaÄ? nezobrazuje obrÃ¡zky sprÃ¡vne."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "VloÅ¾te znaky z obrÃ¡zku vyÅ¡Å¡ie..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +353,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +375,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "PoÅ¾iadaÅ¥ o pÃ´vodnÃ© premostenia."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "PoÅ¾iadaÅ¥ o IPv6 premostenia."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 fedc3aebc..b55ec3e10 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! Z vaÅ¡o zahtevo je bilo nekaj narobe."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Prijavi napako"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Izvorna koda"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Novosti"
 
@@ -103,7 +107,8 @@ msgstr "QR koda vsebuje mostovne povezave. Slikaj kodo za kopiranje mostovnih po
 msgid "There currently aren't any bridges available..."
 msgstr "Trenutno ni na voljo mostovnih povezav..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Poberi %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Korak %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Dobi %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Korak %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sS%samo dodaj mostove!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Napredno"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ne"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "niÄ?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -172,7 +179,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sD%sobi mostove"
@@ -216,7 +223,7 @@ msgstr "Oj, %s!"
 msgid "Hello, friend!"
 msgstr "Pozdravljen!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Javni kljuÄ?"
 
@@ -291,47 +298,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Moji mostovi ne delujejo! Potrebujem pomoÄ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Tu so vrstice mostiÄ?kov:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Pridobite si mostiÄ?ke!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Izberite tip mostiÄ?ka:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 naslove?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ brskalnik ne prikazuje slik pravilno."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Vnesite znake vsebovane v zgornji sliki..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Kako zaÄ?eti uporabljati svoje mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Zahteva za vanilla mostiÄ?ke."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Zaprosi za IPv6 mostove."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 5fbc325ac..91c8a4ab2 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-16 16:00+0000\n"
-"Last-Translator: obial <oltionb@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -52,19 +52,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "KÃ«rkojmÃ« ndjesÃ«! DiÃ§ka shkoi keq me kÃ«rkesÃ«n tuaj."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "GjuhÃ«"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Raportoni njÃ« gabim"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kodi BazÃ«"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Regjistri i ndryshimeve"
 
@@ -103,7 +107,8 @@ msgstr "Ky Kod QR pÃ«rmban linjat e urave tuaja. Skanojeni me njÃ« lexues Kodi Q
 msgid "There currently aren't any bridges available..."
 msgstr "PÃ«r momentin nuk ka ura tÃ« disponueshme..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -125,17 +130,19 @@ msgstr "Shkarkoni %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Hapi %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Merrni %s ura %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Hapi %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Tani %s shtojini urat tek Tor Browser %s"
@@ -144,27 +151,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sM%sÃ« jepni urat!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Opsionet e PÃ«rparuara"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Jo"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "asnjÃ«"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sP%so!"
@@ -172,7 +179,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sM%serr Urat"
@@ -216,7 +223,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "PÃ«rshÃ«ndetje mik!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "KyÃ§a PublikÃ«"
 
@@ -291,47 +298,50 @@ msgstr "NjÃ« mÃ«nyrÃ« tjetÃ«r pÃ«r tÃ« pÃ«rftuar ura Ã«shtÃ« tÃ« dÃ«rgoni njÃ« e
 msgid "My bridges don't work! I need help!"
 msgstr "Urat e mia nuk punojnÃ«! MÃ« duhet ndihmÃ«!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "NÃ«se Tor i juaj nuk mund tÃ« lidhet, ju lutemi shikoni tek  %s dhe %s tonÃ«."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "KÃ«tu janÃ« linjat e urave tuaja:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Merrni Ura!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ju lutemi pÃ«rzgjidhni mundÃ«sitÃ« pÃ«r llojin e urÃ«s:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "A ju nevojiten adresat IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "A ju nevojitet njÃ« %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Futini karakteret nga imazhi mÃ« sipÃ«r..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +350,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +372,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "KÃ«rkoni urat vanilje ose non-Pluggable Transport."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "KÃ«rkoni urat IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 cb237f5ea..be2f6de68 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?Ð¾Ð³Ð¾Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¾Ð¼."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð¸Ð·Ð¼ÐµÐ½Ð°"
 
@@ -107,7 +111,8 @@ msgstr "QR ÐºÐ¾Ð´ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°. 
 msgid "There currently aren't any bridges available..."
 msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¼Ð¸Ñ?Ðµ %s Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ? %s"
 msgid "Step %s2%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ð¾Ñ?Ð°Ðº %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ?%s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð½ÐµÐ¼Ð°"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ¾!"
@@ -176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÐ¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
@@ -220,7 +227,7 @@ msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ñ?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ?ÐµÐ²Ð¸"
 
@@ -295,47 +302,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ð½Ðµ Ñ?Ð°Ð´Ðµ! Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð¼Ð¸ Ñ?Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ?, Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ñ? Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ IPv6 Ð°Ð´Ñ?ÐµÑ?Ðµ?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð?Ð°Ð¼ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð½Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÐµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ Ñ?Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð·Ð½Ð°Ð´..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,21 @@ msgid ""
 msgstr "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? Tor, Ð¿Ñ?Ð²Ð¸ Ð¸Ð´Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð¸ %s Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ %s \nÐ¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¸ Ñ?Ð°Ð¼Ð¾ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ'. Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ñ?Ð²Ð¾Ñ?Ðµ Ð½Ð¾Ð²Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ½Ð°Ð»ÐµÐ¿Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ðµ Ð·Ð° Ñ?Ð½Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°. Ð?Ð¾Ð½Ð°Ñ?Ð½Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'ÐºÐ¾Ð½ÐµÐºÑ?Ñ?Ñ? Ñ?Ðµ', i\nÐ¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ! Ð?ÐºÐ¾ Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¸Ð¼Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÑ? Ñ?Ð°Ñ?Ð¾Ð±Ñ?Ð°ÐºÐ· Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ Ð¢Ð¾Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° Ð±Ð°Ð·Ð¸Ñ?Ð½Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° IPv6 Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ±Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð¿Ð¾ Ð¢Ð?Ð?Ð£."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 a95fecfaf..8a1b2e432 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -45,8 +45,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -60,19 +60,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "NÃ¥got gick tyvÃ¤rr fel med din fÃ¶rfrÃ¥gan."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "SprÃ¥k"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapportera ett fel"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "KÃ¤llkod"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ã?ndringslogg"
 
@@ -111,7 +115,8 @@ msgstr "Denna QR-kod innehÃ¥ller dina rader med broar. Skanna den med en QR-kodl
 msgid "There currently aren't any bridges available..."
 msgstr "FÃ¶r nÃ¤rvarande finns inga broar tillgÃ¤ngliga..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -133,17 +138,19 @@ msgstr "HÃ¤mta %s Tor Browser  %s"
 msgid "Step %s2%s"
 msgstr "Steg %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Skaffa %s broar %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Steg %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
@@ -152,27 +159,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sara ge mig broar!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Avancerade instÃ¤llningar"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Nej"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "inget"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sÃ¤mta broar"
@@ -224,7 +231,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Hej, kompis!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
@@ -299,47 +306,50 @@ msgstr "Ett annat sÃ¤tt att fÃ¥ nya bryggor Ã¤r att skicka e-post till %s. Du m
 msgid "My bridges don't work! I need help!"
 msgstr "Mina broar fungerar inte! Jag behÃ¶ver hjÃ¤lp!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "HÃ¤r Ã¤r dina rader med broar:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Skaffa broar!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "VÃ¤lj alternativ fÃ¶r typ av bro:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "BehÃ¶ver du en IPv6-adress?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BehÃ¶ver du %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Din webblÃ¤sare visar inte bilder korrekt."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Skriv in tecknen frÃ¥n bilden ovan..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -348,21 +358,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +380,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Leta efter vanliga broar."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "BegÃ¤r IPv6-broar"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 567b70ff0..3650909b5 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -34,8 +34,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +49,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Samahani!  Kitufulani kimekwenda vibaya pamoja na ombi lako."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ripoti Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Chanzo msimbo"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Badili log"
 
@@ -100,7 +104,8 @@ msgstr "Msimbo huu wa QR unanayo mistari ya daraja lako.  Scan msimbo wa QR msom
 msgid "There currently aren't any bridges available..."
 msgstr "Huko sasa hakuna madaraja yoyote yanayopatikana..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +127,19 @@ msgstr "Pakua 1%s Kivinjari cha Tor 1%s"
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Pata 1%s madaraja 1%s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Hatua 1%s 3 1%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
@@ -141,27 +148,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "1%s J 1%s ust nipe mimi daraja!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "chaguo la juu"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "hapana"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Hakuna"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "1%s Y 1%s  es!"
@@ -169,7 +176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "1%s G 1%s et Madaraja"
@@ -213,7 +220,7 @@ msgstr "Wewe, 1%s !"
 msgid "Hello, friend!"
 msgstr "Hujamboa, rafiki!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ufunguo za umma"
 
@@ -288,47 +295,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Hapa ni mistari ya daraja lako:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Pata madaraja!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Unahitaji  anuani za IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Unahitaji 1%s ?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Kivinjari chako hakionyeshi picha vizuri."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ingiza maneno kutoka kwenye picha juu..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Jinsi ya kuanza kutumia madaraja yako"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +347,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +369,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ombi Vanilla madaraja."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ombi IPv6 madaraja."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 4fc9bd67c..0ca55536f 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à®®à®©à¯?à®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?! à®?à®?à¯?à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®?à¯?à®³à®¿à®±à¯?à®?à¯? à®?à®¤à¯?à®?à®°à¯?  à®¤à®µà®±à¯? à®¨à¯?à®°à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à®®à¯?à®¾à®´à®¿"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à®?à®°à¯? à®ªà®¿à®´à¯?à®¯à¯? à®?à®±à®¿à®?à¯?à®?à¯?à®?à¯?à®¯à¯?à®?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à®®à¯?à®² à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à®®à®¾à®±à¯?à®±à®®à¯?à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¾à®ªà¯?à®ªà¯?"
 
@@ -104,7 +108,8 @@ msgstr "à®?à®¨à¯?à®¤ QRCode à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®?à®³
 msgid "There currently aren't any bridges available..."
 msgstr "à®¤à®±à¯?à®?à®®à®¯à®®à¯? Bridge-à®?à®³à¯? à®¯à¯?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®µà¯?à®®à¯? %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "à®?à®?à®¿ %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s Bridge-à®?à®³à¯? %s à®ªà¯?à®±à¯?à®?"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à®?à®?à®¿ %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà®¨à¯?%sà®°à®¯à®?à®¿à®¯à®¾à®? bridge-à®?à®³à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à®®à¯?à®®à¯?à®ªà®?à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à®?à®²à¯?à®²à¯?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à®?à®¤à¯?à®µà¯?à®®à®¿à®²à¯?à®²à¯?"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà®?%sà®®à¯?!"
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sà®ªà¯?%sà®°à¯?à®? Bridge-à®?à®³à¯?"
@@ -217,7 +224,7 @@ msgstr "à®¹à¯?, %s!"
 msgid "Hello, friend!"
 msgstr "à®¹à®²à¯?à®¾, à®¤à¯?à®´à®¾!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à®ªà¯?à®¾à®¤à¯? à®?à®¾à®µà®¿à®?à®³à¯?"
 
@@ -292,47 +299,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "à®?à®©à¯? Bridge-à®?à®³à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯?! à®?à®©à®?à¯?à®?à¯? à®?à®¤à®µà®¿ à®¤à¯?à®µà¯?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à¯?à®?à®³à¯?: "
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®?!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Bridge à®µà®?à¯? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? IPv6 à®®à¯?à®?à®µà®°à®¿à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®®à®¾?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®°à¯? %s à®¤à¯?à®µà¯?à®¯à®¾?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr " à®¤à®?à¯?à®?à®³à®¿à®©à¯? browser à®ªà®?à®?à¯?à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®? à®?à®¾à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "à®®à¯?à®²à¯? à®?à®³à¯?à®³ à®ªà®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®°à¯?à®?à¯?à®?à¯?à®®à¯? à®?à®´à¯?à®¤à¯?à®¤à¯?à®?à¯?à®?à®³à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à®¤à®?à¯?à®?à®³à®¿à®©à¯? bridge-à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®¤à¯?à®¾à®?à®?à¯?à®?à¯?à®µà®¤à¯? à®?à®ªà¯?à®ªà®?à®¿"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,21 @@ msgid ""
 msgstr "Tor à®?à®²à®¾à®µà®¿à®¯à®¿à®²à¯? bridgeà®?à®³à¯? à®?à®³à¯?à®³à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯, à®®à¯?à®¤à®²à®¿à®²à¯? %s Tor à®?à®²à®¾à®µà®¿ à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à¯? à®?à¯?à®©à¯?à®±à¯? %s à®®à¯?à®²à¯?à®®à¯? à®ªà®¿à®±à®?à¯? à®?à®?à¯?à®?à¯? Tor à®?à®²à®¾à®µà®¿à®¯à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®¤à¯?à®?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®?à®±à®¿à®µà¯?à®±à¯?à®¤à¯?à®¤à®²à¯?à®?à®³à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à¯?à®?à¯?à®?à®³à¯?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à®?à®®à¯?' à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®¤à¯?à®¤à¯? à®ªà®¿à®©à¯?à®©à®°à¯? 'à®?à®?à¯?à®¤à¯?à®¤à¯?' à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®¤à®?à¯?à®?à®³à®¿à®©à¯? à®ªà¯?à®¤à®¿à®¯ bridge-à®?à®³à¯? à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?, \nà®µà®°à®¿à®?à¯?à®?à®³à¯? à®µà®¾à®?à¯?à®?à®¿à®¯à®®à¯? à®?à®³à¯?à®³à¯?tà®?à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¨à®?à®²à¯?à®?à®?à¯?à®¤à¯?à®¤à¯?  à®ªà¯?à®¸à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®?à®±à¯?à®¤à®¿à®¯à®¾à®?, 'à®?à®£à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯? \nà®?à¯?à®¯à¯?à®¤à®µà¯?à®?à®©à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à¯?à®²à¯?à®² à®¤à®¯à®¾à®°à¯?! à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¿à®°à®?à¯?à®?à®¿à®©à¯?à®¯à¯? à®?à®¨à¯?à®¤à®¿à®¤à¯?à®¤à®¾à®²à¯?, 'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ 'à®?à®¤à®µà®¿' à®ªà¯?à®¾à®¤à¯?à®¤à®¾à®©à¯?  à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®²à¯?à®®à¯? à®?à®¤à®µà®¿ à®ªà¯?à®±à®µà¯?à®®à¯?."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "à®ªà®´à¯?à®¯à®®à¯?à®±à¯?à®¯à®¾à®© bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr " BridgeDB-à®¯à¯?à®?à¯?à®¯ à®ªà¯?à®¾à®¤à¯? GnuPG à®?à®¾à®µà®¿à®¯à®¿à®©à¯? à®?à®°à¯? à®¨à®?à®²à¯? à®ªà¯?à®±à®µà¯?à®®à¯?."
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 9e591db37..8c55ea7d6 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019
 # runasand <inactive+runasand@xxxxxxxxxxxxx>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -34,8 +35,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -49,19 +50,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Source Code"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Changelog"
 
@@ -100,7 +105,8 @@ msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to
 msgid "There currently aren't any bridges available..."
 msgstr "There currently aren't any bridges available..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -122,17 +128,19 @@ msgstr "Download %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Step %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Get %s bridges %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Step %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Now %s add the bridges to Tor Browser %s"
@@ -141,27 +149,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "No"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -169,7 +177,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
@@ -213,7 +221,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Public Keys"
 
@@ -288,47 +296,50 @@ msgstr "Another way to get bridges is to send an email to %s. Please note that y
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-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."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "If your Tor Browser cannot connect, please take a look at the %s and our %s."
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +348,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +370,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 7d3b13346..c46f9828a 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,8 +44,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -59,19 +59,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "à¸?à¸à¸à¸ à¸±à¸¢! à¸¡à¸µà¸à¸°à¹?à¸£à¸?à¸´à¸?à¸?à¸?à¸?à¸´à¹?à¸?à¸´à¸?à¸?à¸¶à¹?à¸?à¸?à¸±à¸?à¸?à¸³à¸?à¸à¸?à¸à¸?à¸?à¸¸à¸?"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¸ à¸²à¸©à¸²"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¹?à¸?à¹?à¸?à¸?à¸±à¹?à¸?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "à¸?à¸à¸£à¹?à¸ªà¹?à¸?à¹?à¸?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "à¸ªà¸¡à¸¸à¸?à¸?à¸±à¸?à¸?à¸¶à¸?à¸ªà¸´à¹?à¸?à¸?à¸à¸?à¹?à¸«à¸¡à¹?"
 
@@ -110,7 +114,8 @@ msgstr "à¸£à¸«à¸±à¸ª QR à¸?à¸µà¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¥à¸?à¸ºà¸ªà¹?à¸?
 msgid "There currently aren't any bridges available..."
 msgstr "à¸?à¸±à¸?à¸?à¸¸à¸?à¸±à¸?à¸?à¸µà¹?à¹?à¸¡à¹?à¸¡à¸µà¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸µà¹?à¹?à¸?à¹?à¹?à¸?à¹?"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -132,17 +137,19 @@ msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸? %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "à¸¥à¸³à¸?à¸±à¸?%s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "à¹?à¸à¸² %s à¸?à¸£à¸´à¸?à¸?à¹? à¸¡à¸² %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "à¸¥à¸³à¸?à¸±à¸?%s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "à¸?à¸à¸?à¸?à¸µà¹? %s à¹?à¸?à¸´à¹?à¸¡à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸? Tor Browser %s"
@@ -151,27 +158,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸«à¹?à¸?à¸±à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸?!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¹?à¸?à¸ªà¸¹à¸?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "à¹?à¸¡à¹?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "à¹?à¸?à¸¥à¹?à¸²"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sà¹?à¸?à¹?%s"
@@ -179,7 +186,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sà¹?à¸à¸²%sà¸?à¸£à¸´à¸?à¸?à¸ºà¸¡à¸²"
@@ -223,7 +230,7 @@ msgstr "à¹?à¸®à¹?!, %s!"
 msgid "Hello, friend!"
 msgstr "à¸ªà¸§à¸±à¸ªà¸?à¸µà¹?à¸?à¸·à¹?à¸à¸?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "à¸?à¸¸à¸?à¹?à¸?à¸ªà¸²à¸?à¸²à¸£à¸?à¸°"
 
@@ -298,47 +305,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸¡à¹?à¸?à¸³à¸?à¸²à¸? à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸§à¸²à¸¡à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸ "
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¸?à¸µà¹?à¸?à¸µà¹?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "à¸£à¸±à¸?à¸?à¸£à¸´à¸?à¸?à¹?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "à¸?à¸£à¸¸à¸?à¸²à¹?à¸¥à¸·à¸à¸?à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸?à¸´à¸?à¸?à¸à¸?à¸?à¸£à¸´à¸?à¸?à¹?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸µà¹?à¸à¸¢à¸¹à¹? IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£ %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "à¸?à¸£à¸²à¸§à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸¡à¹?à¹?à¸ªà¸?à¸?à¸?à¸¥à¸à¸¢à¹?à¸²à¸?à¸?à¸µà¹?à¸?à¸§à¸£"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "à¸?à¸´à¸¡à¸?à¹?à¸?à¸±à¸§à¸à¸±à¸?à¸©à¸£à¸?à¸²à¸?à¸ à¸²à¸?à¸?à¹?à¸²à¸?à¸?à¸?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?à¹?à¸?à¹?à¸à¸¢à¹?à¸²à¸?à¹?à¸£"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +357,21 @@ msgid ""
 msgstr "à¸?à¹?à¸à¸?à¸?à¸°à¹?à¸?à¹?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¹?à¸? Tor Browser, à¸?à¹?à¸à¸?à¸à¸·à¹?à¸?à¹?à¸?à¸?à¸µà¹? %s à¸«à¸?à¹?à¸² Tor Browser à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?\nà¹?à¸¥à¸°à¸?à¸³à¸?à¸²à¸¡à¸?à¸±à¹?à¸?à¸?à¸à¸?à¹?à¸?à¸·à¹?à¸à¹?à¸£à¸´à¹?à¸¡à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?à¹?à¸¥à¸°à¹?à¸£à¸´à¹?à¸¡ Tor Browser"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +379,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "à¹?à¸¥à¸·à¸à¸? 'à¹?à¸?à¹?' à¹?à¸¥à¸°à¸?à¸? 'à¸?à¹?à¸à¹?à¸?' à¹?à¸?à¸·à¹?à¸à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¸?à¸£à¸´à¸?à¸?à¹?à¸?à¸à¸?à¸?à¸¸à¸?, à¸ªà¸³à¹?à¸?à¸² à¹?à¸¥à¸°\nà¸§à¸²à¸? à¹?à¸ªà¹?à¸?à¸?à¸²à¸?à¸?à¸£à¸´à¸?à¸?à¹? à¹?à¸?à¸?à¸¥à¹?à¸à¸?à¸?à¹?à¸à¸?à¸§à¸²à¸¡. à¸ªà¸¸à¸?à¸?à¹?à¸²à¸¢, à¸?à¸? 'à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸', à¹?à¸¥à¸°\nà¸?à¸¸à¸?à¸?à¸§à¸£à¸?à¸°à¹?à¸?à¹?à¸?à¹?à¸?à¸µ! à¸«à¸²à¸?à¸?à¸¸à¸?à¸?à¸´à¸?à¸?à¸±à¸?à¸«à¸², à¹?à¸«à¹?à¸¥à¸à¸?à¸?à¸?à¸?à¸¸à¹?à¸¡ 'à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸'\nà¹?à¸?à¸«à¸?à¹?à¸² 'Tor Network Settings' wizard à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸§à¸²à¸¡à¸?à¹?à¸§à¸¢à¹?à¸«à¸¥à¸·à¸à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "à¸?à¸à¸£à¹?à¸à¸?à¸?à¸£à¸´à¸?à¸?à¹?à¸¡à¸²à¸?à¸£à¸?à¸²à¸?"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "à¸£à¹?à¸à¸?à¸?à¸ IPv6 à¸?à¸£à¸´à¸?à¸?à¹?"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 416d83a91..c6a95151f 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-17 06:16+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: Kaya Zeren <kayazeren@xxxxxxxxx>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -52,8 +52,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -67,19 +67,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?zgÃ¼nÃ¼z! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Bir Hata Bildirin"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kaynak Kodu"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "SÃ¼rÃ¼m NotlarÄ±"
 
@@ -118,7 +122,8 @@ msgstr "Bu QR Kodunda kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z bulunuyor. KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z
 msgid "There currently aren't any bridges available..."
 msgstr "Å?u anda kullanÄ±labilecek bir kÃ¶prÃ¼ yok..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -140,17 +145,19 @@ msgstr "%s Tor Browser UygulamasÄ±nÄ± %s indirin"
 msgid "Step %s2%s"
 msgstr "%s2%s. AdÄ±m"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s KÃ¶prÃ¼leri %s edinin"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s. AdÄ±m"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
@@ -159,27 +166,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sana sadece kÃ¶prÃ¼leri verin!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "GeliÅ?miÅ? Ayarlar"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "HayÄ±r"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 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/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sE%svet!"
@@ -187,7 +194,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%sÃ¶prÃ¼leri Al"
@@ -231,7 +238,7 @@ msgstr "Selam, %s!"
 msgid "Hello, friend!"
 msgstr "Selam, arkadaÅ?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Herkese AÃ§Ä±k Anahtarlar"
 
@@ -306,47 +313,50 @@ msgstr "KÃ¶prÃ¼leri almanÄ±n diÄ?er bir yolu da %s adresine bir e-posta gÃ¶nderm
 msgid "My bridges don't work! I need help!"
 msgstr "KÃ¶prÃ¼lerim Ã§alÄ±Å?mÄ±yor! YardÄ±m gerek!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "Tor uygulamanÄ±z baÄ?lantÄ± kuramÄ±yorsa lÃ¼tfen %s ve %s bÃ¶lÃ¼mlerine bakÄ±n."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ä°Å?te kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "KÃ¶prÃ¼leri Al!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfen kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§eneklerini belirleyin:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 adresleri gerekli mi?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s gerekli mi?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 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:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "YukarÄ±daki gÃ¶rselde bulunan karakterleri yazÄ±n..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "KÃ¶prÃ¼lerinizi nasÄ±l kullanabilirsiniz"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +365,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -377,28 +387,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Normal kÃ¶prÃ¼ isteÄ?inde bulun."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶prÃ¼sÃ¼ isteÄ?inde bulun."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± isteÄ?inde bulun."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 30d93a0a2..8897d9bf4 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
 "Last-Translator: erinm\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -56,19 +56,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð¸ Ð¿Ñ?Ð¸Ð½Ð¾Ñ?Ð¸Ð¼Ð¾ Ð½Ð°Ñ?Ñ? Ð²Ð¸Ð±Ð°Ñ?ÐµÐ½Ð½Ñ?! Ð©Ð¾Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð· Ð?Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ð¸Ñ?Ð¾Ð¼."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?Ð¾Ð²Ð°"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ð?Ð¾Ð´"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
 
@@ -107,7 +111,8 @@ msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -129,17 +134,19 @@ msgstr "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ð¸ %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
@@ -148,27 +155,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ð?Ñ?"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ð¶Ð¾Ð´ÐµÐ½"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -176,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸"
@@ -220,7 +227,7 @@ msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð´Ñ?Ñ?Ð¶Ðµ!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ? ÐºÐ»Ñ?Ñ?Ñ?"
 
@@ -295,47 +302,50 @@ msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð?Ð°Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ?:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼."
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸ ..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð°Ñ?Ð¸Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ?Ð°Ð¼Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +354,21 @@ msgid ""
 msgstr "Ð©Ð¾Ð± Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Tor Browser, Ñ?Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ? Ñ?Ð´Ñ?Ñ?Ñ? Ð½Ð°  %s Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÑ? Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Tor Browser %s Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ñ?Ð»Ñ?Ð´Ñ?Ð¹Ñ?Ðµ Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð¼ Ð´Ð»Ñ? Ñ?ÐºÐ°Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ?  Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +376,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? \"Ð¢Ð°Ðº\", Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ñ?\". Ð?Ð»Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¸Ñ? bridges, Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ðµ Ð»Ñ?Ð½Ñ?Ñ? bridge Ñ? Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?. Ð?Ð¾Ñ?Ñ?Ð¼, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?', Ñ?\nÐ²Ñ?Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸! Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ \"Ð?Ð¾Ð²Ñ?Ð´ÐºÐ°\" \nÐ² Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð¾Ð²Ñ? \"Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Tor' Ð´Ð»Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? vanilla bridges."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 28c40993e..37f0fa84d 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: Ali Kamran <kamran@xxxxxxxxxxxxxxxxxxxxxxxxxx>\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"
@@ -35,8 +35,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -50,19 +50,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ø²Ø¨Ø§Ù?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ù?Ø³Ø¦Ù?Û? Ø±Ù¾Ù?Ø±Ù¹ Ú©Ø±Û?Úº"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Ø³Ù?Ø±Ø³ Ú©Ù?Ú?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Ù?Ø§Ú¯ ØªØ¨Ø¯Û?Ù? Ú©Ø±Û?Úº"
 
@@ -101,7 +105,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -123,17 +128,19 @@ msgstr ""
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -142,27 +149,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ù?Ø²Û?Ø¯ Ø§Ù?ØªØ®Ø§Ø¨Ø§ØªÛ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "Ù?Û?Û?Úº"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "Ú©Ù?Ø¦Û? Ù?Û?Û?Úº"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -170,7 +177,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -214,7 +221,7 @@ msgstr "Û?Û?Ù?Ù? Ø? %s"
 msgid "Hello, friend!"
 msgstr "Û?Û?Ù?Ù? Ø¯Ù?Ø³ØªÙ?!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ø¹Ù?Ø§Ù?Û? Ú?Ø§Ø¨Û?"
 
@@ -289,47 +296,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ú©Û?Ø§ Ø§Ù?Ù¾ Ú©Ù? Ø§Û?Ú© %s Ú?Ø§Ø¦Û?Û? Ø?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +348,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +370,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 25bdca2cd..694a3084f 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -36,8 +36,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -51,19 +51,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "Uzr, nimadir xato ketdi."
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Til"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Nosozlik haqida xabar berish"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "Kod"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "OÊ»zgarishlar"
 
@@ -102,7 +106,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -124,17 +129,19 @@ msgstr " %s Tor brauzeri %sni yuklab olish"
 msgid "Step %s2%s"
 msgstr "%s2%s-bosqich"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "%s3%s-qadam"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -143,27 +150,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "Ilg'or moslamalar"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "YoÊ»q"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "yoÊ»q"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sH%sa!"
@@ -171,7 +178,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
@@ -215,7 +222,7 @@ msgstr "Salom, %s!"
 msgid "Hello, friend!"
 msgstr "Salom, do'st!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "Ommaviy kalitlar"
 
@@ -290,47 +297,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +349,21 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +371,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 1b8f82b64..f1d6c544f 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,8 +38,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -53,19 +53,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 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/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "NgÃ´n ngá»¯"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "BÃ¡o cÃ¡o lá»?i"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "MaÌ? NguÃ´Ì?n"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "Nháºt kÃ½ thay Ä?Ã´Ì?i"
 
@@ -104,7 +108,8 @@ msgstr "MaÌ? QR chÆ°Ì?a nhá»¯ng Ä?Æ°á»?ng cáº§u ná»?i cuÌ?a baÌ£n. QuÃ©t noÌ? b
 msgid "There currently aren't any bridges available..."
 msgstr "Hiá»?n khÃ´ng cÃ³ sáºµn cáº§u ná»?i nÃ o..."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -126,17 +131,19 @@ msgstr "TaÌ?i xuÃ´Ì?ng %s Tor Browser %s"
 msgid "Step %s2%s"
 msgstr "BÆ°Æ¡Ì?c %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "ChoÌ£n %sbridges%s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "BÆ°Æ¡Ì?c %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "BÃ¢y giÆ¡Ì? thiÌ? %s thÃªm bridges Ä?oÌ? vaÌ?o Tor Browser %s"
@@ -145,27 +152,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sC%shiÌ? cÃ¢Ì?n Ä?Æ°a cho tÃ´i bridges!"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "CaÌ?c TuÌ?y ChoÌ£n NÃ¢ng Cao"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "KhÃ´ng"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "rÃ´Ì?ng"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sV%sÃ¢ng!"
@@ -173,7 +180,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sL%sÃ¢Ì?y Bridges"
@@ -217,7 +224,7 @@ msgstr "NaÌ?y, %s!"
 msgid "Hello, friend!"
 msgstr "ChÃ o báº¡n!"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "KhÃ³a cÃ´ng khai"
 
@@ -292,47 +299,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "Bridges cuÌ?a tÃ´i khÃ´ng hoaÌ£t Ä?Ã´Ì£ng! TÃ´i cÃ¢Ì?n giuÌ?p Ä?Æ¡Ì?!"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "Bridge lines cuÌ?a baÌ£n Ä?Ã¢y:"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "LÃ¢Ì?y Bridges!"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho bridge type:"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "BaÌ£n coÌ? cÃ¢Ì?n caÌ?c Ä?iÌ£a chiÌ? IPv6?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BaÌ£n coÌ? cÃ¢Ì?n mÃ´Ì£t %s?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 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:133
+#: bridgedb/strings.py:135
 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:137
+#: bridgedb/strings.py:139
 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:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +351,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:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +373,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:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "YÃªu cÃ¢Ì?u bridges nguyÃªn gÃ´Ì?c."
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 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:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 ba4155b62..71179f94c 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-09 01:44+0000\n"
-"Last-Translator: ff98sha\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -47,8 +47,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -62,19 +62,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "è¯è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "æ?¥å??æ¼?æ´?"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "æº?ä»£ç ?"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "æ?´æ?¹æ?¥å¿?"
 
@@ -113,7 +117,8 @@ msgstr "äº?ç»´ç ?å??å?«ç½?æ¡¥ä¿¡æ?¯ã??å?©ç?¨äº?ç»´ç ?æ?«æ??ç¨?åº?ï¼?å?¯å°?ç?¸åº?
 msgid "There currently aren't any bridges available..."
 msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -135,17 +140,19 @@ msgstr "ä¸?è½½ %s Tor æµ?è§?å?¨ %s"
 msgid "Step %s2%s"
 msgstr "ç¬¬ %s 2 %s æ¥"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "è?·å?? %s ç½?æ¡¥ %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "ç¬¬ %s 3 %s æ¥"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
@@ -154,27 +161,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é«?çº§é??é¡¹"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "æ? "
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "æ?¯(%sY%s)ï¼?"
@@ -182,7 +189,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "è?·å??ç½?æ¡¥(%sG%s)"
@@ -226,7 +233,7 @@ msgstr "ä½ å¥½ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬å?±å¯?å??"
 
@@ -301,47 +308,50 @@ msgstr "è?·å¾?ç½?æ¡¥ç??å?¦ä¸?ç§?æ?¹æ³?æ?¯å?? %s å??é??ä¸?å°?é?®ä»¶ã??æ³¨æ??ï¼?
 msgid "My bridges don't work! I need help!"
 msgstr "ç?¨ç½?æ¡¥ä¹?æ? æ³?è¿?æ?¥ï¼?é??è¦?å¸®å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr "å¦?æ??æ?¨ç?? Tor æ? æ³?è¿?æ?¥ï¼?è¯·æ?¥ç??%så??%sã??"
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "è?·å¾?ç½?æ¡¥ï¼?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "è¯·é??æ?©ç±»å??ç±»å??ã??"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¯å?¦é??è¦? %sï¼?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "è¯·è¾?å?¥ä¸?å?¾ä¸ç??å?ç¬¦ï¼?ä¸?å?ºå??å¤§å°?å??ï¼?..."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?ä½¿ç?¨ç½?æ¡¥"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +360,21 @@ msgid ""
 msgstr "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?è¯·å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?è½½é¡µé?¢ %s ç??è¯´æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +382,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?è¯·å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?å¸®å?©ï¼?è¯·ç?¹å?»â??Tor ç½?ç»?è®¾ç½®â??å??å¯¼çª?å?£ä¸ç??â??å¸®å?©â??æ??é?®ã??"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "è¯·æ±?æ?®é??ç½?æ¡¥ã??"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "è¯·æ±?IPv6ç½?ç»?ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§ç±»å??è¯·æ±?ä¸?å??ç??å?¯æ??æ??ä¼ è¾?ç½?æ¡¥ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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 c4fda3149..1b34fdb3b 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+0000\n"
+"Last-Translator: erinm\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"
@@ -39,8 +39,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -54,19 +54,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "èª?è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "æ?´æ?°æ?¥èª?"
 
@@ -105,7 +109,8 @@ msgstr "æ¤QRCodeå?«ä½ å??æ©?æ?¥ç·?è·¯ã??ä»¥æµ?å??è£?ç½®æ??ç??å?¯å??å¾?ä½ å??æ©?
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??ç?¡å?¯ç?¨å??æ©?æ?¥å?¨â?¦"
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -127,17 +132,19 @@ msgstr "ä¸?è¼?%s Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
 msgid "Step %s2%s"
 msgstr "æ¥é©?%s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾?%sæ©?æ?¥å?¨%s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©?%s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨%s"
@@ -146,27 +153,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sç??%sæ??æ©?æ?¥ï¼?"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sæ?¯%sï¼?"
@@ -174,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%så??å¾?%sæ©?æ?¥å?¨"
@@ -218,7 +225,7 @@ msgstr "å?¿ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "æ??å??ï¼?ä½ å¥½ï¼?"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬å??"
 
@@ -293,47 +300,50 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸é??ä½?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸å??æ©?æ?¥å?¨é¡?å??ï¼?"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "ä½ é??è¦?IPv6ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "ä½ é??è¦?%så??ï¼?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "ä½ å??ç??è¦½å?¨å??è?½å¤ æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "è¼¸å?¥ä¸?é?¢å??å??ä¸å??å?å??â?¦"
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "é»?æ¨£é??å§?ä½¿ç?¨æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +352,21 @@ msgid ""
 msgstr "å°?æ©?æ?¥å?¨è¼¸å?¥å?°Toræ´?è?¥è·¯ç?±ç??è¦½å?¨ï¼?è«?é¦?å??å??å¾?%s Toræ´?è?¥è·¯ç?±\nç??è¦½å?¨ä¸?è¼?é ?é?¢%sï¼?ä¸¦æ??ç?§é ?é?¢ä¸?å??æ??ç¤ºä¸?è¼?å??å??å??Toræ´?è?¥\nè·¯ç?±ç??è¦½å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +374,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é?¸å??ã??æ?¯ã??ï¼?ç?¶å¾?æ?³ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?°æ©?æ?¥å?¨ï¼?è«?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼å?°æ??å?è¼¸å?¥å?£ä¸ã??æ??å¾?ï¼?æ?³ã??é?£æ?¥ã??ã??\nå¦?æ??é??å?°éº»ç?©ï¼?è«?å??è©¦æ?³ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??å??ã??èª¬æ??ã??\nå°?æ±?é?²ä¸?æ¥å??å?©ã??"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "è«?æ±?Vanillaæ©?æ?¥å?¨ã??"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "è«?æ±?IPv6æ©?æ?¥å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 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:170
+#: bridgedb/strings.py:172
 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 f93bfc53b..12950e16e 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+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"
@@ -40,8 +40,8 @@ msgstr ""
 #. 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.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -55,19 +55,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "èª?è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr "è®?æ?´è¨?é??"
 
@@ -106,7 +110,8 @@ msgstr "é??å?? QRCode å?«æ??æ?¨ç??æ©?æ?¥å?¨ç?¸é??è³?è¨?ï¼?å?©ç?¨ QRCode è®?å??
 msgid "There currently aren't any bridges available..."
 msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¨æ?¥å?¯ç?¨....."
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -128,17 +133,19 @@ msgstr "ä¸?è¼? %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ %s"
 msgid "Step %s2%s"
 msgstr "æ¥é©? %s2%s"
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "å??å¾? %s æ©?æ?¥å?¨ %s"
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr "æ¥é©? %s3%s"
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
@@ -147,27 +154,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/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%s %s çµ¦æ??æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr "é?²é??é?¸é ?"
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr "å?¦"
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr "ç?¡"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -175,7 +182,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/distributors/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%s è¨å®?æ©?æ?¥å?¨"
@@ -219,7 +226,7 @@ msgstr "å?¿ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
 
-#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "å?¬é??é??é?°"
 
@@ -294,47 +301,50 @@ msgstr "å??å¾?æ©?æ?¥ç??å?¦ä¸?ç¨®æ?¹å¼?æ?¯ç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?
 msgid "My bridges don't work! I need help!"
 msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¨é??è¦? %s å??ï¼?"
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr "æ?¨ç??ç??è¦½å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?é??å§?ä½¿ç?¨æ?¨ç??æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +353,21 @@ msgid ""
 msgstr "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸?è¼?é ?é?¢ %s ä¸¦æ??ç?§é ?é?¢ä¸?ç??èªªæ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??è¦½å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 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:148
+#: bridgedb/strings.py:150
 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:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then 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 +375,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥å?¨ï¼?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼ä¸?å?°æ??å?è¼¸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??å°±å¥½ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??è©¦æ??ä¸?ä¸?ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??èª¬æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 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:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:170
+#: bridgedb/strings.py:172
 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/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
Next by Author: [tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
Previous by thread: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
Next by thread: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
Index(es):
- Author
- Thread