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

[tor-commits] [bridgedb/develop] Update existing translations.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [bridgedb/develop] Update existing translations.
From: phw@xxxxxxxxxxxxxx
Date: Fri, 7 Jun 2019 15:39:12 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 07 Jun 2019 11:40:05 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Philipp Winter <phw@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 449027f527e44d049c4f65e0485760c1d4fcebfc
Author: Philipp Winter <phw@xxxxxxxxx>
Date:   Mon May 20 18:11:59 2019 -0700

    Update existing translations.
    
    Also, fix a unit test that broke because of an updated translation
    string.
---
 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po    | 352 ++++++++++++-----------
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po    | 333 ++++++++++++----------
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po    | 349 ++++++++++++-----------
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po    | 350 +++++++++++------------
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po    | 396 +++++++++++++-------------
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po    | 378 ++++++++++++------------
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po    | 353 +++++++++++------------
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po    | 367 +++++++++++++-----------
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++++++++++-----------
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po    | 406 +++++++++++++-------------
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po    | 370 ++++++++++++------------
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po    | 343 +++++++++++-----------
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po    | 422 +++++++++++++--------------
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po    | 404 ++++++++++++++++++++++----
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po    | 418 ++++++++++++++++++++++-----
 bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 ++++++++++++-------------
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po    | 353 +++++++++++------------
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po    | 400 +++++++++++++-------------
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po    | 351 ++++++++++++-----------
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po    | 348 ++++++++++++-----------
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po    | 418 +++++++++++++++++++++++----
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po    | 342 +++++++++++-----------
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po    | 410 +++++++++++++++++++++-----
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++++++++++++++++++++++-----
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po    | 366 ++++++++++++------------
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po    | 356 +++++++++++------------
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po    | 344 +++++++++++-----------
 bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po    | 400 +++++++++++++-------------
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 ++++++++++++------------
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po    | 378 ++++++++++++------------
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po    | 427 ++++++++++++++--------------
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po    | 345 +++++++++++-----------
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po    | 341 +++++++++++-----------
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po    | 374 ++++++++++++------------
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po    | 379 ++++++++++++------------
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po    | 328 +++++++++++----------
 bridgedb/i18n/templates/bridgedb.pot        | 184 ++++++------
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po    | 403 +++++++++++++-------------
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po    | 352 +++++++++++------------
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++++++++++------------
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++++++++++++++-------------
 bridgedb/test/test_https_server.py          |   2 +-
 42 files changed, 8385 insertions(+), 6737 deletions(-)

diff --git a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
index fa77860..0a071e3 100644
--- a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
@@ -3,34 +3,42 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Abderrahman Ait Ali <abde.aitali@xxxxxxxx>, 2017
 # A. Hassan <a_hassan@xxxxxxxxxxx>, 2015
 # Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2014
 # allamiro <allamiro@xxxxxxxxx>, 2011
 # Ash <ali.shatrieh@xxxxxxxxx>, 2014
+# blah bleh <wshalash@xxxxxxxxxxxxx>, 2018
+# ButterflyOfFire, 2018
 # debo debo <a.adeebo@xxxxxxxxx>, 2015
 # Mohamed El-Feky <elfeky.m@xxxxxxxxx>, 2014
+# Elias Saba <elias55saba@xxxxxxxxx>, 2018
 # AnonymousLady <farah.jaza@xxxxxxxxxxx>, 2014
 # 0xidz <ghoucine@xxxxxxxxx>, 2014
-# KACIMI LAMINE <k_lamine27@xxxxxxxx>, 2015
+# lamine Kacimi <k_lamine27@xxxxxxxx>, 2015
+# Khaled Hosny, 2018
+# maher tharwat <mahmoud_tharwat2002@xxxxxxxxxxx>, 2016
 # Ù?ØÙ?Ø¯ Ø§Ù?ØØ±Ù?Ø§Ù? <malham1@xxxxxxxxx>, 2011
 # Nudroid A <Nudroid@xxxxxxxxxxx>, 2015
+# shadows99 <nabils51@xxxxxxxxx>, 2019
 # Sherief Alaa <sheriefalaa.w@xxxxxxxxx>, 2013-2014
 # Sherief Alaa <sheriefalaa.w@xxxxxxxxx>, 2013
 # Valetudinarian <themcnx@xxxxxxxxx>, 2014
+# yahia zakaria <yahiazak@xxxxxxxxxxx>, 2015
 # Ù?ØÙ?Ø¯ Ø§Ù?ØØ±Ù?Ø§Ù? <malham1@xxxxxxxxx>, 2011
 # Ù?ØÙ?Ù? Ø§Ù?Ø¯Ù?Ù? <tx99h4@xxxxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-22 16:42+0000\n"
-"Last-Translator: A. Hassan <a_hassan@xxxxxxxxxxx>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-04 10:15+0000\n"
+"Last-Translator: shadows99 <nabils51@xxxxxxxxx>\n"
+"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
@@ -45,57 +53,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ø¹Ø°Ø±Ø§Ù?! ØØ¯Ø« Ø®Ø·Ø£ Ù?Ù? Ø·Ù?Ø¨Ù?."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ø§ØªØµÙ? Ø¨Ù?Ø§"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ØØ¯Ø¯ Ø§Ù?Ù?Ù?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ø£Ø¸Ù?Ø± Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ (QRCode)"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø®Ø·Ù?Ø· Ø§Ù?Ù?ØµÙ?"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ù?Ù?Ø£Ø³Ù? Ù?Ù? Ù?ØªÙ? Ø§Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ù?Ø§ Ø·Ù?Ø¨Øª"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ù?Ø¨Ø¯Ù? Ø£Ù? Ù?Ù?Ø§Ù? Ø®Ø·Ø£ Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø±Ù?Ø²Ù? Ù?Ù?Ø¥Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ø±Ù?Ø² Ø§Ù?Ø§Ø³ØªØ¬Ø§Ø¨Ø© Ø§Ù?Ø³Ø±Ù?Ø¹ Ù?Ø°Ø§ Ù?ØØªÙ?Ù? Ø¹Ù?Ù? Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? .Ø§Ù?Ø±Ø£ Ø§Ù?Ø±Ù?Ø² Ø¨Ù?Ø§Ø±Ø¦ Ù?Ù?Ø§Ø³Ø¨ Ù?Ù?Ø³Ø® Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? Ø¥Ù?Ù? Ø§Ù?Ù?Ø§ØªÙ? Ø§Ù?Ù?ØÙ?Ù?Ù? Ø£Ù? Ø£Ø¬Ù?Ø²Ø© Ø£Ø®Ø±Ù?."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ù?Ø§ Ù?Ù?Ø¬Ø¯ Ø£Ù? bridges Ù?ØªØ§ØØ© ØØ§Ù?Ù?Ø§"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ø±Ø¨Ù?Ø§ ØªØØªØ§Ø¬ Ø¥Ù?Ù? %s Ø§Ù?Ø¹Ù?Ø¯Ø© %s Ù? Ø§Ø®ØªÙ?Ø§Ø± Ù?Ù?Ø¹ bridge Ù?Ø®ØªÙ?Ù?"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ø®Ø·Ù?Ø© %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ØÙ?Ù? %s Ù?ØªØµÙ?Ø Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ø®Ø·Ù?Ø© %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ø®Ø·Ù?Ø© %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÙ?%sÙ?Ø· Ø£Ø¹Ø·Ù?Ù? bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªÙ?Ø¯Ù?Ø©"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ù?Ø§"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ù?Ø§ Ø´Ù?Ø¡"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÙ?%sØ¹Ù?!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sØ£%sØµÙ? Ø¹Ù?Ù? Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ù?Ø°Ù? Ø±Ø³Ø§Ù?Ø© ØªÙ?Ù?Ø§Ø¦Ù?Ø© Ø? Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø¹Ø¯Ù? Ø§Ù?Ø±Ø¯.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ø§Ù?Ù? bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ù?Ù?Ø¯ ØªØ®Ø·Ù?Øª Ø§Ù?ØØ¯ Ø§Ù?Ù?Ø³Ù?Ù?Ø Ø¨Ù?. Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±! Ø§Ù?ØØ¯ Ø§Ù?Ø£Ø¯Ù?Ù? Ù?Ù? Ø§Ù?Ù?Ù?Øª Ø¨Ù?Ù? Ø§Ù?Ø±Ø³Ø§Ø¦Ù? Ù?Ù?  %s Ø³Ø§Ø¹Ø§Øª. Ù?Ù? Ø±Ø³Ø§Ø¦Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?Ø§Ø¯Ù?Ø© Ø®Ù?Ø§Ù? ØªÙ?Ù? Ø§Ù?Ù?ØªØ±Ù? Ø³Ù?ØªÙ? ØªØ¬Ø§Ù?Ù?Ù?Ø§."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs :(Ø§Ø¬Ù?Ø¹ Ø§Ù?Ù?COMMANDs Ù?ØªØØ¯Ù?Ø¯ Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªØ¹Ø¯Ø¯Ø© Ù?Ù? Ù?Ù?Øª Ù?Ø§ØØ¯)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ù?Ø±ØØ¨Ø§ Ø¨Ù?Ù? Ù?Ù? BridgeDB"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Ù?Ø³Ø§Ø¦Ù? Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØªØ§ØÙ? TYPE:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ù?Ø±ØØ¨Ø§Ø? %s "
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ù?Ø±ØØ¨Ø§ ,ØµØ¯Ù?Ù?Ù?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ù?Ù?Ø§ØªÙ?Ø Ø¹Ø§Ù?Ø©"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -106,7 +239,7 @@ msgstr "Ù?Ø°Ø§ Ø§Ù?Ø¨Ø±Ù?Ø¯ ØªÙ? Ø¥Ù?Ø´Ø§Ø¦Ù? Ù?Ù? %s Ù?Ù?Ù? %s Ø§Ù?Ø³Ø§Ø¹Ø© %s"
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -117,7 +250,7 @@ msgid ""
 msgstr "BridgeDB Ù?Ø³ØªØ·Ù?Ø¹ ØªÙ?Ù?Ù?Ø± %s Ø§Ù?Ù?Ø§Ø¹ Ù?Ù? Ø§Ù?Ù? Pluggable Transports %s Ù?Ù?Ù? ØªØ³Ø§Ø¹Ø¯ Ø¹Ù?Ù? ØªØ¹ØªÙ?Ù? Ø§ØªØµØ§Ù?Ø§ØªÙ? Ø¨Ø§Ù?Ù? Tor NetworkØ? Ù? Ù?Ù?ØªÙ?Ø¬Ø© Ù?Ø°Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù? Ø§Ù?ØµØ¹Ø¨ Ø¹Ù?Ù? Ø£Ù? Ø§ØØ¯ Ù?Ø±Ø§Ù?Ø¨ ØØ±Ù?Ø© Ù?Ø±Ù?Ø±Ù? Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø¨ØªØØ¯Ù?Ø¯ Ø§Ø°Ø§ Ù?Ø§ Ù?Ù?Øª ØªØ³ØªØ®Ø¯Ù? Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -129,7 +262,7 @@ msgstr "Ø¨Ø¹Ø¶ Ø§Ù?Ù? bridges Ù?Ù?Ø§ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø? Ù?Ù?Ù?Ù?Ù?Ø§ Ù?Ù?Ø³Øª 
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -138,33 +271,33 @@ msgid ""
 "\n"
 msgstr "Ø¨Ø§Ù?Ø£Ø¶Ø§Ù?Ø© Ø¥Ù?Ù? Ø°Ù?Ù?Ø? BridgeDB Ù?ØØªÙ?Ù? Ø¹Ù?Ù? bridges %s Ø¹Ø§Ø¯Ù?Ø© Ø¨Ø¯Ù?Ù? Ø£Ù? Pluggable Transports %s ØªØ³ØªØ·Ù?Ø¹ Ø§Ù?Ø¶Ø§ Ø§Ù?Ù?Ø³Ø§Ø¹Ø¯Ø© Ù?Ù? Ø§Ù?ØªØØ§Ù?Ù? Ø¹Ù?Ù? Ø±Ù?Ø§Ø¨Ø© Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ù?Ù? Ø§Ù?Ù?Ø«Ù?Ø± Ù?Ù? Ø§Ù?Ø§ØÙ?Ø§Ù?.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ù?Ø§ Ù?Ù? bridgesØ?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Ù?Ù? Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù? Ù?Ø±ØÙ?Ø§Øª Tor ØªØ³Ø§Ø¹Ø¯Ù? Ø¹Ù?Ù? Ø§Ù?ØªØØ§Ù?Ù? Ø¹Ù?Ù? Ø§Ù?ØØ¬Ø¨."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ø£ØØªØ§Ø¬ Ø¥Ù?Ù? Ù?Ø³Ù?Ù?Ø© Ø¨Ø¯Ù?Ù?Ø© Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¬Ø³Ù?Ø± Ø¹Ø¨Ø± Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù?Ù? Ù?Ø¬Ø¨ Ø§Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ù?Ù? Ø§ØØ¯Ù? Ø§Ù?Ø¹Ù?Ø§Ù?Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯Ù?Ø© Ø§Ù?ØªØ§Ù?Ù?Ø©: %s Ø£Ù? %s Ø£Ù? %s."
+msgstr "Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¬Ø³Ù?Ø± Ù?Ù? Ø¹Ø¨Ø± Ø¥Ø±Ø³Ø§Ù? Ø¨Ø±Ù?Ø¯ Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù?Ù? Ù?Ø¬Ø¨ Ø§Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¹Ø¨Ø± Ø¹Ù?Ù?Ø§Ù? Ø¨Ø±Ù?Ø¯Ù? Ù?Ù? Ø¥ØØ¯Ù? Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø£Ù? %s Ø£Ù? %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "bridges Ù?Ø§ ØªØ¹Ù?Ù?! Ø£Ù?Ø§ Ø¨ØØ§Ø¬Ø© Ø¥Ù?Ù? Ù?Ø³Ø§Ø¹Ø¯Ø©!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ù?Ù? ØØ§Ù? Ø¹Ø¯Ù? Ø¹Ù?Ù? Tor, Ø§Ø±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?Ù? %s."
@@ -172,71 +305,71 @@ msgstr "Ù?Ù? ØØ§Ù? Ø¹Ø¯Ù? Ø¹Ù?Ù? Tor, Ø§Ø±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?Ù?
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "ØØ§Ù?Ù? Ø§Ù? ØªØªØ¶Ù?Ù? Ø±Ø³Ø§Ù?ØªÙ? Ø¹Ù?Ù? Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ù?Ø«Ù?Ø±Ø© Ø¹Ù? Ù?Ø´Ù?Ù?ØªÙ?Ø? Ø¨Ù?Ø§ Ù?Ù? Ø°Ù?Ù? Ù?Ø§Ø¦Ù?Ø© Ø§Ù?Ù?bridges Ù? Pluggable Transports Ø§Ù?Ø°Ù? ØªØØ§Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù?Ù?Ø? Ù?Ø±Ù?Ù? Ù?Ø³Ø®Ø© Tor Browser Ù?Ø£Ù? Ø±Ø³Ø§Ø¦Ù? Ø§Ø¸Ù?Ø±Ù?Ø§ TorØ? Ø¥Ù?Ø®."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ù?Ø§ Ù?Ù? Ø³Ø·Ù?Ø± Ø§Ù?Ù?Bridges Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ø£ØØµÙ? Ø¹Ù?Ù? Bridges"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ù? Ù?Ø¶Ù?Ù? ØØ¯Ø¯ Ø§Ù?Ø®Ù?Ø§Ø±Ø§Øª Ù?Ù?Ù?Ø¹ Ø§Ù?Ù?bridge"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¹Ù?Ø§Ù?Ù?Ù? IPv6Ø?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ù?Ù? ØªØØªØ§Ø¬ Ø¥Ù?Ù? %sØ?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?ØªØµÙ?ØÙ? Ù?Ø§ Ù?Ø¹Ø±Ø¶ Ø§Ù?ØµÙ?Ø± Ø¨Ø´Ù?Ù? ØµØÙ?Ø"
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ø£Ø¯Ø®Ù? Ø§Ù?ØØ±Ù?Ù? Ø£Ù? Ø§Ù?Ø£Ø±Ù?Ø§Ù? Ù?Ù? Ø§Ù?ØµÙ?Ø±Ø© Ø£Ø¹Ù?Ø§Ù? ..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ù?Ù?Ù? ØªØ¨Ø¯Ø£ Ø¨Ø§Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?Ù?bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Ù?ØªØªÙ?Ù?Ù? Ù?Ù? Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ø¥Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø Ø? Ø£Ø°Ù?Ø¨ Ø¥Ù?Ù? %s ØµÙ?ØØ© ØªØÙ?Ù?Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø %s Ù?Ø£ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ø¨Ù?Ø§ Ù?ØªØÙ?Ù?Ù? Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ù?ØªØµÙ?Ø  "
+msgstr "Ù?ØªØªÙ?Ù?Ù? Ù?Ù? Ø¥Ø¯Ø®Ø§Ù? Ø¬Ø³Ù?Ø± Ø¥Ù?Ù? Ø§Ù?Ù?ØªØµÙ?Ø TorØ? Ø£Ø°Ù?Ø¨ Ø¥Ù?Ù? %s ØµÙ?ØØ© ØªØÙ?Ù?Ù?Ø§Øª Ø§Ù?Ù?ØªØµÙ?Ø  Tor %s Ù?Ø£ØªØ¨Ø¹ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ù?Ù?Ù?Ø§ Ù?Ù? Ø§Ø¬Ù? ØªØÙ?Ù?Ù? Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ù?ØªØµÙ?Ø  Tor"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -244,153 +377,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ø§Ø®ØªØ§Ø± 'Ù?Ø¹Ù?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? Ø¨Ù?ØµÙ? Ø§Ù?Ù?bridges Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø© Ù?Ù? Ø§Ù?Ù?Ø±Ø¨Ø¹. Ø«Ù? Ø§Ø®ØªØ§Ø± 'Ø§ØªØµØ§Ù?' Ù? Ø§Ø°Ø§ Ù?Ø§Ø¬Ù?ØªÙ? Ù?Ø´Ù?Ù?Ø© Ø§Ø¶ØºØ· Ø¹Ù?Ù? 'Ù?Ø³Ø§Ø¹Ø¯Ø©' Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø§Ø¹Ø¯Ø§Ø¯ Tor."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "ØªØ¸Ù?Ø± Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø©"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Ø£Ø·Ù?Ø¨ bridges Ø¹Ø§Ø¯Ù?Ø©."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Ø£Ø·Ù?Ø¨ IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ø£Ø·Ù?Ø¨ Pluggable Transport Ø¨Ù? TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? Ù?Ø³Ø®Ø© Ù?Ù? Ù?Ù?ØªØ§Ø GnuPG Ø§Ù?Ø¹Ø§Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù?BridgeDB"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Ø§ØªØµÙ? Ø¨Ù?Ø§"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ØØ¯Ø¯ Ø§Ù?Ø¨Ø±Ø§Ù?Ø¬"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Ø£Ø¸Ù?Ø± Ø§Ù?Ø±Ù?Ø² Ø§Ù?Ù?Ø±Ø¨Ù?Ø¹"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Ø§Ù?Ø±Ù?Ø² Ø§Ù?Ù?Ø±Ø¨Ù?Ø¹ Ø§Ù?ØªØ§Ø¨Ø¹ Ù?Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ù?Ù?Ø£Ø³Ù? Ù?Ù? Ù?ØªÙ? Ø§Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ù?Ø§ Ø·Ù?Ø¨Øª"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ù?Ø¨Ø¯Ù? Ø£Ù? Ù?Ù?Ø§Ù? Ø®Ø·Ø£ Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø§Ù?Ø±Ù?Ø² Ø§Ù?Ù?Ø±Ø¨Ù?Ø¹ Ø§Ù?Ø®Ø§Øµ Ø¨Ù?."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ù?Ø°Ø§ Ø§Ù?Ø±Ù?Ø² Ø§Ù?Ù?Ø±Ø¨Ù?Ø¹ Ù?ØØªÙ?Ù? Ø¹Ù?Ù? Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? .Ø§Ù?Ø±Ø£ Ø§Ù?Ø±Ù?Ø² Ø¨Ù?Ø§Ø±Ø¦ Ø§Ù?Ø±Ù?Ù?Ø² Ø§Ù?Ù?Ø±Ø¨Ø¹Ø© Ù?Ù?Ø³Ø® Ø®Ø·Ù?Ø· Ø¬Ø³Ø±Ù? Ø§Ù?Ù? Ø§Ù?Ù?Ø§ØªÙ? Ø§Ù?Ø¬Ù?Ø§Ù? Ø§Ù? Ø£Ø¬Ù?Ø²Ø© Ø§Ø®Ø±Ù?."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ù?Ø§ Ù?Ù?Ø¬Ø¯ Ø£Ù? bridges Ù?ØªØ§ØØ© ØØ§Ù?Ù?Ø§"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ø±Ø¨Ù?Ø§ ØªØØªØ§Ø¬ Ø¥Ù?Ù? %s Ø§Ù?Ø¹Ù?Ø¯Ø© %s Ù? Ø§Ø®ØªÙ?Ø§Ø± Ù?Ù?Ø¹ bridge Ù?Ø®ØªÙ?Ù?"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ø®Ø·Ù?Ø© %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ØÙ?Ù? %s Ù?ØªØµÙ?Ø Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ø®Ø·Ù?Ø© %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ø®Ø·Ù?Ø© %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ø§Ù?Ø¢Ù? %s Ø£Ø¶Ù? Ø§Ù?Ù?bridges Ø¥Ù?Ù? Ù?ØªØµÙ?Ø Tor %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÙ?%sÙ?Ø· Ø£Ø¹Ø·Ù?Ù? bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ù?ØªÙ?Ø¯Ù?Ø©"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ù?Ø§"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÙ?%sØ¹Ù?!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sØ£%sØµÙ? Ø¹Ù?Ù? Bridges"
diff --git a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
index 8c71518..649a847 100644
--- a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,22 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# E <ehuseynzade@xxxxxxxxx>, 2014-2015
+# D, 2014-2015
+# Emin Mastizada <emin@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-01-03 18:01+0000\n"
-"Last-Translator: E <ehuseynzade@xxxxxxxxx>\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-01-17 21:21+0000\n"
+"Last-Translator: Emin Mastizada <emin@xxxxxxxxx>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,57 +31,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lÄ± nÉ? isÉ? sÉ?hv oldu."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Problemi XÉ?bÉ?r Ver"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "MÉ?nbÉ? Kodu"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "DÉ?yiÅ?ikliklÉ?r"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Æ?laqÉ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "HamÄ±sÄ±nÄ± SeÃ§"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Kodu GÃ¶stÉ?r"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "KÃ¶rpÃ¼ sÉ?tirlÉ?riniz Ã¼Ã§Ã¼n QR Kod"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Vay dÉ?dÉ?m!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "GÃ¶rÃ¼nÃ¼r QR Kodunuzu almada sÉ?hv yarandÄ±."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Bu QR Kodunda kÃ¶rpÃ¼ sÉ?tirlÉ?riniz var. Bunu QR Kod oxuyucularla gÃ¶zdÉ?n keÃ§irin vÉ? kÃ¶rpÃ¼ sÉ?tirlÉ?rinizi mobil vÉ? digÉ?r cihazlara kÃ¶Ã§Ã¼rÃ¼n."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "HazÄ±rda mÃ¼mkÃ¼n kÃ¶rpÃ¼ yoxdur..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ã?ox gÃ¼man ki, sÉ?n %s geri qayÄ±dÄ±b %s baÅ?qa kÃ¶rpÃ¼ nÃ¶vÃ¼ seÃ§mÉ?li idin!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1-ci%s AddÄ±m"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor SÉ?yyahÄ±nÄ± %s Endir"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2-ci%s AddÄ±m"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s KÃ¶rpÃ¼ %s Æ?ldÉ? Et"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3-cÃ¼%s AddÄ±m"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? et %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? kÃ¶rpÃ¼lÉ?ri ver!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "TÉ?kmillÉ?Å?dirilmiÅ? SeÃ§imlÉ?r"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Xeyr"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "heÃ§ biri"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sB%sÉ?li!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%sÃ¶rpÃ¼ Æ?ldÉ? Et"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu avtomatik cavabdÄ±r, lÃ¼tfÉ?n cavab yazma.]"
+msgstr "[Bu avtomatik mesajdÄ±r, lÃ¼tfÉ?n cavab yazmayÄ±n.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Bu da sÉ?nin kÃ¶rpÃ¼lÉ?rin:"
+msgstr "Bu da kÃ¶rpÃ¼lÉ?riniz:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "SÉ?s limitini keÃ§misÉ?n. LÃ¼tfÉ?n yavaÅ?la! EmaillÉ?r arasÄ± minimal vaxt\n%s saatdÄ±r. Bu zaman kÉ?siyindÉ? daxil edilÉ?n diÉ?r emaillÉ?r lÉ?Ä?v edilÉ?cÉ?kdir."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "Æ?MRLÆ?R: (bir neÃ§É? seÃ§imi mÃ¼É?yyÉ?nlÉ?Å?dirmÉ?k Ã¼Ã§Ã¼n Æ?MRLÆ?Ri birlÉ?Å?dir)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB-É? xoÅ? gÉ?lkmisÉ?n!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "MÃ¶vcud dÉ?stÉ?klÉ?nÉ?n nÉ?qliyyat NÃ?VlÉ?ri:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ey, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Salam, dost!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ä°ctimai AÃ§arlar"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Bu email gÃ¶y qurÅ?aÄ?Ä±, tÉ?buynuz vÉ? qÄ±Ä?Ä±lcÄ±mla hazÄ±rlanÄ±b\n%s
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
 msgstr "BridgeDB mÃ¼xtÉ?lif %s nÃ¶v Pluggable Transport %s vasitÉ?silÉ? kÃ¶rpÃ¼lÉ?r mÃ¼É?yyÉ?n \nedÉ? bilÉ?r, bu sÉ?nin internet trafikini yoxlamaq istÉ?yÉ?n hÉ?r hansÄ± Å?É?xs Ã¼Ã§Ã¼n \nÉ?laqÉ?lÉ?rini Tor Network ilÉ? kÃ¶lgÉ?lÉ?yÉ?rÉ?k sÉ?nin Tor istifadÉ? etdiyini mÃ¼É?yyÉ?n \netmÉ?sinÉ? daha Ã§ox mane olacaqdÄ±r.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Pluggable Transports vasitÉ?silÉ? mÃ¶vcud olan IPv6 Ã¼nvanlÄ± bir Ã§ox \
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
 "\n"
 msgstr "Bundan É?lavÉ? BridgeDB Pluggable Transports %s olmayan bir sÄ±ra darÄ±xdÄ±rÄ±cÄ± \nkÃ¶rpÃ¼lÉ?r %s dÉ? vardÄ±r, amma onlar yenÉ? dÉ? internet senzurasÄ±ndan \nsovuÅ?maÄ?Ä± bacarÄ±rlar.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "KÃ¶rpÃ¼lÉ?r nÉ?dir?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s KÃ¶rpÃ¼lÉ?r %s Tor-un keÃ§idi olub sÉ?nÉ? senzuradan sovuÅ?maÄ?a kÃ¶mÉ?k edir."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "KÃ¶rpÃ¼lÉ?rin É?ldÉ? edilmÉ?sinin alternativ yollarÄ±nÄ± axtarÄ±ram!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "KÃ¶rpÃ¼lÉ?ri É?ldÉ? etmÉ?yin baÅ?qa yolu da %s emailinÉ? mÉ?ktub yazmaqdÄ±r. LÃ¼tfÉ?n, yadÄ±nda\nsaxla ki, email gÃ¶ndÉ?rÉ?n zaman aÅ?aÄ?Ä±dakÄ± email tÉ?min edicilÉ?rindÉ?n birini istifadÉ? etmÉ?lisÉ?n:\n%s, %s vÉ? ya %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Æ?gÉ?r Tor iÅ?lÉ?mirsÉ?, sÉ?n %s Ã¼nvanÄ±na yazmalÄ±san."
@@ -157,70 +283,71 @@ msgstr "Æ?gÉ?r Tor iÅ?lÉ?mirsÉ?, sÉ?n %s Ã¼nvanÄ±na yazmalÄ±san."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Yaranan vÉ?ziyyÉ?t haqqÄ±nda É?traflÄ± mÉ?lumat yazmaÄ?a Ã§alÄ±Å?; kÃ¶rpÃ¼lÉ?rin siyahÄ±sÄ± vÉ? \nistifadÉ? etmÉ?yÉ? Ã§alÄ±Å?dÄ±Ä?Ä± Pluggable Transport-un adÄ±, Tor Browser versiyan vÉ? \nTor tÉ?rÉ?findÉ?n aldÄ±Ä?Ä±n hÉ?r hansÄ± mesaj vÉ? s."
+msgstr "Yaranan vÉ?ziyyÉ?t haqqÄ±nda É?traflÄ± mÉ?lumat yazmaÄ?a Ã§alÄ±Å?; kÃ¶rpÃ¼lÉ?rin siyahÄ±sÄ± vÉ? \nistifadÉ? etmÉ?yÉ? Ã§alÄ±Å?dÄ±Ä?Ä± Pluggable Transport-un adÄ±, Tor SÉ?yyahÄ±nÄ±n versiyasÄ± vÉ? \nTor tÉ?rÉ?findÉ?n aldÄ±Ä?Ä±n hÉ?r hansÄ± mesaj vÉ? s."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "SÉ?nin kÃ¶rpÃ¼ sÉ?tirlÉ?rin:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "KÃ¶rpÃ¼ Æ?ldÉ? Et!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "LÃ¼tfÉ?n, kÃ¶rpÃ¼ nÃ¶vlÉ?ri Ã¼Ã§Ã¼n seÃ§imlÉ?ri mÃ¼É?yyÉ?nlÉ?Å?dir:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 Ã¼nvanlara ehtiyacÄ±n var?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ehtiyacÄ±n var?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "SÉ?nin brauzerin Å?É?killÉ?ri gÃ¶stÉ?rÉ? bilmir."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "YuxarÄ±dakÄ± Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 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".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "KÃ¶rpÃ¼lÉ?ri Tor Browser-É? daxil etmÉ?k Ã¼Ã§Ã¼n %s Tor Browser-dÉ?ki qaydalara riayÉ?t edÉ?rÉ?k \n%s sÉ?hifÉ?sini yÃ¼klÉ? ki, Tor Browser baÅ?lasÄ±n."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "KÃ¶rpÃ¼lÉ?ri Tor SÉ?yyahÄ±na É?lavÉ? etmÉ?k Ã¼Ã§Ã¼n ilk olaraq %s Tor SÉ?yyahÄ±nÄ± endirmÉ?\nsÉ?hifÉ?sinÉ? %s gedin vÉ? daha sonra endirib Tor SÉ?yyahÄ±nÄ± qurmaq Ã¼Ã§Ã¼n oradakÄ±\naddÄ±mlarÄ± izlÉ?yin."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ä°nternet XidmÉ?t TÉ?qdimatÃ§Ä±sÄ± (Ä°XT) sÉ?nin Tor Å?É?bÉ?kÉ?sinÉ? giriÅ?ini kilidlÉ?yir vÉ? ya \nÉ?laqÉ?lÉ?rÉ? mÉ?hdudiyyÉ?tlÉ?r qoyur?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,130 +355,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É?."
 
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Bu mesajÄ± gÃ¶stÉ?rir."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Vanil kÃ¶rpÃ¼ xahiÅ? et."
 
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶rpÃ¼ xahiÅ? et."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB-nin ictimai GnuPG aÃ§arÄ±nÄ±n Ã¼zÃ¼nÃ¼ É?ldÉ? et."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Problemi XÉ?bÉ?r Ver"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "MÉ?nbÉ? Å?ifrÉ?si"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "DÉ?yiÅ?ikliklÉ?r"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Æ?laqÉ?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
-msgid "Uh oh, spaghettios!"
-msgstr "Vay dÉ?dÉ?m!"
-
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "HazÄ±rda mÃ¼mkÃ¼n kÃ¶rpÃ¼ yoxdur..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ã?ox gÃ¼man ki, sÉ?n %s geri qayÄ±dÄ±b %s baÅ?qa kÃ¶rpÃ¼ nÃ¶vÃ¼ seÃ§mÉ?li idin!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "%s1-ci%s AddÄ±m"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s YÃ¼klÉ?"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "%s2-ci%s AddÄ±m"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s KÃ¶rpÃ¼ %s Æ?ldÉ? Et"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "%s3-cÃ¼%s AddÄ±m"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ä°ndi %s kÃ¶rpÃ¼lÉ?ri Tor Browser-nÉ? É?lavÉ? et %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? kÃ¶rpÃ¼ ver!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Æ?traflÄ± SeÃ§imlÉ?r"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Xeyr"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sK%sÃ¶rpÃ¼ Æ?ldÉ? Et"
diff --git a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
index 2d95c12..9a0d45a 100644
--- a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,24 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
 # aramaic <aramaicbg@xxxxxxxxx>, 2015
+# Kaloyan Nikolov <kotipuka01@xxxxxxxxx>, 2016
+# Maxi <kutia0001@xxxxxxxxx>, 2015
+# Tsvetan Nikolov <slakware@xxxxxxxxx>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-01-14 12:40+0000\n"
-"Last-Translator: aramaic <aramaicbg@xxxxxxxxx>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,68 +33,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Something went wrong with your request."
+msgstr "Ð¡Ñ?Ð¶Ð°Ð»Ñ?Ð²Ð°Ð¼Ðµ! Ð?ÐµÑ?Ð¾ Ñ?Ðµ Ð¾Ð±Ñ?Ñ?ÐºÐ° Ñ? Ð·Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð²Ð¸."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ð?Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð¡Ð¾Ñ?Ñ? ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ð?Ð·Ð±eÑ?Ð¸ Ð²Ñ?Ð¸Ñ?ÐºÐ¾"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR Ð?Ð¾Ð´"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR Ð?Ð¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð»Ð¸Ð½Ð¸Ð¸"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ð?Ð¾Ð¾, Ñ?Ð¿Ð°Ð³ÐµÑ?ÐºÐ¸!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð?Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ðµ Ð¸Ð¼Ð°Ð»Ð¾ Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ð°Ñ?Ð¸Ñ? QR Ð?Ð¾Ð´."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ð¢Ð¾Ð·Ð¸ QRCode Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸. Ð¡ÐºÐ°Ð½Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð³Ð¾ Ñ? QR Ð?Ð¾Ð´ Ñ?ÐµÑ?ÐµÑ? Ð´Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð»Ð¸Ð½Ð¸Ð¸ ÐºÑ?Ð¼ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ bridges ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ð?Ð°Ð¹ Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° %s Ñ?Ðµ Ð²Ñ?Ñ?Ð½ÐµÑ?Ðµ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ð·Ð»Ð¸Ñ?ÐµÐ½t bridge Ñ?Ð¸Ð¿!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ð¡Ð²Ð°Ð»Ð¸ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð?Ð·ÐµÐ¼Ð¸ %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð¼Ð¸ Ð´Ð°Ð¹Ñ?Ðµ bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ð Ð°Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ð?Ðµ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð½Ð¸Ñ?Ð¾"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ?%sÐ°!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ?%sÐ·ÐµÐ¼Ð¸ Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ; Ð¼Ð¾Ð»Ñ? Ð½Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð°Ñ?Ñ?Ð¹Ñ?Ðµ.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ð¢Ð¾Ð²Ð° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð¸ bridges:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Ð?Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ñ? Ð¸-Ð¼ÐµÐ¹Ð» Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð»Ñ? Ð·Ð°Ð±Ð°Ð²ÐµÑ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ñ?Ð¼Ñ?Ñ? Ð¼ÐµÐ¶Ð´Ñ? \nÐ¸-Ð¼ÐµÐ¹Ð»Ð¸ Ðµ %s Ñ?Ð°Ñ?Ð°. Ð?Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ð»ÐµÐ´Ð²Ð°Ñ?Ð¸ Ð¸-Ð¼ÐµÐ¹Ð»Ð¸ Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ñ?Ðµ Ð±Ñ?Ð´Ð°Ñ? Ð°Ð½Ñ?Ð»Ð¸Ñ?Ð°Ð½Ð¸."
+msgstr "Ð?Ð°Ð´Ñ?Ð²Ñ?Ñ?Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ñ? Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ð·Ð° Ðµ-Ð¿Ð¾Ñ?Ð° . Ð?Ð¾Ð»Ñ? Ð·Ð°Ð±Ð°Ð²ÐµÑ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ? Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ð¼ÐµÐ¶Ð´Ñ? Ð´Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ð¸ Ðµ %s Ñ?Ð°Ñ?Ð°. Ð?Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ð»ÐµÐ´Ð²Ð°Ñ?Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð¸ Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ñ?Ðµ Ð±Ñ?Ð´Ð°Ñ? Ð°Ð½Ñ?Ð»Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ?Ð°Ð¹ COMMANDs Ð·Ð° Ð´Ð° Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ? Ð¼Ñ?Ð»Ñ?Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸ ÐµÐ´Ð½Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ð?Ð¾Ð±Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¸ Ð² BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Ð?ÐºÑ?Ñ?Ð°Ð»Ð½Ð¸ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ð¥ÐµÐ¹, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²ÐµÐ¹, Ð¿Ñ?Ð¸Ñ?Ñ?ÐµÐ»!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ ÐºÐ»Ñ?Ñ?"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Ð¢Ð¾Ð·Ð¸ Ð¸-Ð¼ÐµÐ¹Ð» Ð±ÐµÑ?Ðµ Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð°Ð½ Ñ? Ð´Ñ?Ð³Ð¸, Ñ?Ð½Ð¸ÐºÐ¾Ñ?Ð½Ð¸, Ð¸ Ð·Ð°Ñ?Ñ?\nÐ·Ð°  %s Ð½Ð° %s Ð¿Ñ?Ð¸ %s."
+msgstr "Ð¢Ð¾Ð·Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð° Ð±ÐµÑ?Ðµ Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð°Ð½Ð° Ñ? Ð´Ñ?Ð³Ð¸, ÐµÐ´Ð½Ð¾Ñ?Ð¾Ð·Ð¸, Ð¸ Ð·Ð°Ñ?Ñ?\nÐ·Ð°  %s Ð² %s Ð² %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,10 +227,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶Ð¸ bridges Ñ? Ð¼Ð½Ð¾Ð³Ð¾ %stypes Ð½Ð° Pluggable Transports%s,\nÐºÐ¾Ð¸Ñ?Ð¾ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð´Ñ?Ð¸Ð³Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° ÐºÑ?Ð¼ Tor Network, Ð¿Ñ?Ð°Ð²ÐµÐ¹ÐºÐ¸ Ñ? Ð¿Ð¾\nÑ?Ñ?Ñ?Ð´Ð½Ð° Ð·Ð° Ð½Ð°Ð±Ð»Ñ?Ð´ÐµÐ½Ð¸Ðµ Ð·Ð° Ð²Ñ?ÐµÐºÐ¸ Ð½Ð°Ð±Ð»Ñ?Ð´Ð°Ð²Ð°Ñ? Ð²Ð°Ñ?Ð¸Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð´Ð° Ð¾Ñ?ÐºÑ?Ð¸Ðµ Ñ?Ðµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Tor\n \n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶Ð¸ bridges Ñ? Ð¼Ð½Ð¾Ð³Ð¾ %sÐ²Ð¸Ð´Ð¾Ð²Ðµ Ð½Ð° Pluggable Transports%s,\nÐºÐ¾Ð¸Ñ?Ð¾ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð´Ñ?Ð¸Ð³Ñ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° ÐºÑ?Ð¼ Tor Network, Ð¿Ñ?Ð°Ð²ÐµÐ¹ÐºÐ¸ Ñ? Ð¿Ð¾\nÑ?Ñ?Ñ?Ð´Ð½Ð° Ð·Ð° Ð½Ð°Ð±Ð»Ñ?Ð´ÐµÐ½Ð¸Ðµ Ð·Ð° Ð²Ñ?ÐµÐºÐ¸ Ð½Ð°Ð±Ð»Ñ?Ð´Ð°Ð²Ð°Ñ? Ð²Ð°Ñ?Ð¸Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð´Ð° Ð¾Ñ?ÐºÑ?Ð¸Ðµ Ñ?Ðµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Tor\n \n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -114,244 +242,143 @@ msgstr "Ð?Ñ?ÐºÐ¾Ð¹ bridges Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸ Ñ?Ð° Ñ?Ñ?Ñ?Ð¾ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸, Ð½
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ· Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸\nPluggable Transports %s ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ? Ñ?Ð¾Ð»ÐºÐ¾Ð²Ð° Ð´Ð¾Ð±Ñ?Ðµ, Ð½Ð¾ Ð²Ñ?Ðµ Ð¿Ð°Ðº Ð¼Ð¾Ð³Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ð¾Ñ?Ð°Ñ?Ð° Ð² Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
+msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ· Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸\nPluggable Transports %s ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ? Ñ?Ð¾Ð»ÐºÐ¾Ð²Ð° Ð´Ð¾Ð±Ñ?Ðµ, Ð½Ð¾ Ð²Ñ?Ðµ Ð¿Ð°Ðº Ð¼Ð¾Ð³Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð² Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ð?Ð°ÐºÐ²Ð¾ Ñ?Ð° bridges?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Ñ?Ð° Tor relays ÐºÐ¾Ð¸Ñ?Ð¾ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ñ? Ð·Ð° Ð·Ð°Ð¾Ð±Ð¸ÐºÐ°Ð»Ñ?Ð½Ðµ Ð½Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð°."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° bridges!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° bridges Ðµ Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¸-Ð¼ÐµÐ¹Ð» Ð´Ð¾ %s. Ð?Ð¾Ð»Ñ? Ð¾Ñ?Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ Ñ?Ðµ Ð²Ð¸Ðµ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð°\nÐ¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¸-Ð¼ÐµÐ¹Ð» Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÐºÐ¸ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° ÐµÐ´Ð¸Ð½ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ñ?Ð¸:\n%s, %s or %s."
+msgstr "Ð?Ñ?Ñ?Ð³ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð·Ð° Ð½Ð°Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° bridges Ðµ Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s. Ð?Ð¾Ð»Ñ? Ð¾Ñ?Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ, Ñ?Ðµ Ð²Ð¸Ðµ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð°\nÐ¸Ð·Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÐºÐ¸ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° ÐµÐ´Ð¸Ð½ Ð¾Ñ? Ñ?Ð»ÐµÐ´Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ñ?Ð¸:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ bridges Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ?! Ð?Ð¼Ð°Ð¼ Ð½Ñ?Ð¶Ð´Ð° Ð¾Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ÐºÐ¾ Ð²Ð°Ñ?Ð¸Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¸-Ð¼ÐµÐ¹Ð» Ð´Ð¾ %s."
+msgstr "Ð?ÐºÐ¾ Ð²Ð°Ñ?Ð¸Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ð° Ð´Ð¾ %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð»ÐºÐ¾Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹, Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ñ?Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð°\nbridges Ð¸ Pluggable Transports ÐºÐ¾Ð¸Ñ?Ð¾ Ñ?Ñ?Ðµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð»Ð¸, Ð²Ð°Ñ?Ð°Ñ?Ð° Tor Browser Ð²ÐµÑ?Ñ?Ð¸Ñ?,\nÐ¸ Ð²Ñ?Ñ?ÐºÐ¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ñ? ÐºÐ¾ÐµÑ?Ð¾ Tor Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ð», Ð¸ Ñ?.Ð½."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð¢Ñ?Ñ? Ñ?Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridge Ð²Ñ?Ñ?Ð·ÐºÐ¸:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ð?Ð·ÐµÐ¼ÐµÑ?Ðµ Bridges!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ñ? Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ? Ð·Ð° Ð²Ð¸Ð´ bridge:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ñ?Ð·Ð´Ð°ÐµÑ?Ðµ Ð»Ð¸ Ñ?Ðµ Ð¾Ñ? %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ?Ð¸Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ñ?Ðµ Ð¾Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð¾Ñ? Ð³Ð¾Ñ?Ðµ..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°Ðº Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ð´Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "Ð?Ð° Ð´Ð° Ð²Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ bridges Ð² Tor Browser, Ñ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ð½Ð° %s Tor\nBrowser Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°Ñ?Ð°  %s Ð·Ð° Ð´Ð° Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Ð?Ð° Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° bridges Ð² Tor Browser, Ð¿Ñ?Ñ?Ð²Ð¾ Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° \n%s Tor Browser Ñ?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ %s Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° \nÑ?Ð»ÐµÐ´Ð²Ð°Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ð²Ð°Ð»Ñ?Ð½Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð¦ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð»Ð¸ Ð¸Ð»Ð¸ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð²Ð¸ Ð²Ð°Ñ?Ð¸Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº (ISP)\nÐ´Ð¾ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ 'Yes' Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Next'. Ð?Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ bridges, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¸\nÐ¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ bridge Ð»Ð¸Ð½Ð¸Ð¸ Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾ Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ. Ð?Ð° ÐºÑ?Ð°Ñ? Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ 'Connect', Ð¸\nÑ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð´Ð½Ð¾Ñ?Ñ?Ð¸, Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° 'Help'\nÐ±Ñ?Ñ?Ð¾Ð½Ð° Ð²  'Tor Network Settings' Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ?."
+msgstr "Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ Ñ?Ð¾Ð²Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð°Ð¿Ñ?ÐµÐ´'. Ð?Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ bridges, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¸\nÐ¿Ð¾Ñ?Ñ?Ð°Ð²ÐµÑ?Ðµ bridge Ñ?ÐµÐ´Ð¾Ð²ÐµÑ?Ðµ Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð²Ð¾ Ð²Ñ?Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ. Ð?Ð° ÐºÑ?Ð°Ñ? Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ 'Ð¡Ð²Ñ?Ñ?Ð¶Ð¸ Ñ?Ðµ', Ð¸\nÑ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ñ?Ñ?Ð´Ð½Ð¾Ñ?Ñ?Ð¸, Ð¾Ñ?Ð¸Ð´ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?' Ð±Ñ?Ñ?Ð¾Ð½Ð° Ð²  'Tor Network Settings' Ñ?Ñ?Ð²ÐµÑ?Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸ÐµÑ?Ð¾."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð°Ð¹ vanilla bridges."
+msgstr "Ð?Ð°Ñ?Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸ bridges."
 
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð°Ð¹ IPv6 bridges."
+msgstr "Ð?Ð°Ñ?Ð²Ð¸ IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð°Ð¹ Pluggable Transport Ð¿Ð¾ TYPE."
+msgstr "Ð?Ð°Ñ?Ð²Ð¸ Pluggable Transport Ñ?Ð¿Ð¾Ñ?ÐµÐ´ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ð·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ðµ Ð½Ð° BridgeDB's Ð¾Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½ GnuPG ÐºÐ»Ñ?Ñ?."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Ð?Ð½Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð°Ð¹ Ð·Ð° Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "Source ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?Ð¾Ð¾, Ñ?Ð¿Ð°Ð³ÐµÑ?ÐºÐ¸!"
-
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ bridges ..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ð?Ð°Ð¹ Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° %s Ñ?Ðµ Ð²Ñ?Ñ?Ð½ÐµÑ?Ðµ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ð·Ð»Ð¸Ñ?ÐµÐ½t bridge Ñ?Ð¸Ð¿!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ð¡Ð²Ð°Ð»Ð¸ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð?Ð·ÐµÐ¼Ð¸ %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ð¡Ñ?Ñ?Ð¿ÐºÐ° %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡ÐµÐ³Ð° %sÐ´Ð¾Ð±Ð°Ð²ÐµÑ?Ðµ bridges ÐºÑ?Ð¼ Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust Ð´Ð°Ð¹ Ð¼Ð¸ bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ð?Ð¿Ñ?Ð¸Ð¸ Ð·Ð° Ð½Ð°Ð¿Ñ?ÐµÐ´Ð½Ð°Ð»Ð¸"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ð?Ðµ"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÐ?%sÐ°!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÐ?%sÐ·ÐµÐ¼Ð¸ Bridges"
diff --git a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
index 2be8825..f169b0e 100644
--- a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
@@ -4,24 +4,24 @@
 # 
 # Translators:
 # Albert <provisionalib@xxxxxxxxxxx>, 2013
-# Assumpta Anglada <assumptaanglada@xxxxxxxxx>, 2014
+# Assumpta <assumptaanglada@xxxxxxxxx>, 2014
 # Eloi GarcÃa i Fargas, 2014
-# Humbert <humbert.costas@xxxxxxxxx>, 2014
+# Humbert, 2014
 # isis <isis@xxxxxxxxxxxxxx>, 2015
 # laia_, 2014-2015
 # Toni Hermoso Pulido <toniher@xxxxxxxxxxxxxx>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-20 18:02+0000\n"
-"Last-Translator: laia_\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -36,57 +36,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Quelcom ha anat malament amb la peticiÃ³."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Comunica un error"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Codi font"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registre de canvis"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacte"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostra el codi QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Codi QR per les lÃnies de ponts"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Vatua l'olla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Hi ha hagut un error en obtenir el codi QR"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mÃ²bil i a altres dispositius. "
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "No hi ha ponts disponibles en aquests moments."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Pas %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarrega %s Navegador Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Pas %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Descarrega %s ponts %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Pas %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ara %s adjunta els ponts al Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust donem els meus bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcions AvanÃ§ades"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Cap"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sÃ!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sD%sescarrega Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Aquest Ã©s un missatge automÃ tic, no el respongui.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Els vostres ponts: "
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Heu superat el lÃmit. El mÃnim de temps entre\nels correus Ã©s de %s hores. La resta de correus durant aquest perÃode de temps seran ignorats."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs per especificar les mÃºltiples opcions simultÃ niament)"
+msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultÃ niament)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Benvingut a BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Actualment suportant transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hola, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hola, amic!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Claus PÃºbliques"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -97,7 +222,7 @@ msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant MartÃ i espurnes\
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,10 +230,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB pot proveÃ¯r ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexiÃ³ a Tor Network, fent mÃ©s difÃcil determinar que esteu usant Tor a qualsevol que vegi el vostre trÃ fic de connexiÃ³ a\ninternet \n"
+msgstr "BridgeDB pot proveÃ¯r ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexiÃ³ a Tor Network, fent mÃ©s difÃcil determinar que esteu usant Tor a qualsevol que vegi el vostre trÃ fic de connexiÃ³ a\ninternet. \n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -120,7 +245,7 @@ msgstr "TambÃ© hi ha ponts disponibles amb adreces IPv6, tot i que alguns Plugga
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -129,20 +254,20 @@ msgid ""
 "\n"
 msgstr "A mÃ©s a mÃ©s, BridgeDB tÃ© molts ponts %s estÃ ndard sense \nPluggable Transports %s, que potser no sÃ³n tan interessants, perÃ² que tambÃ©\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "QuÃ¨ sÃ³n els ponts?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ponts %s sÃ³n repetidors Tor que ajuden a esquivar la censura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Em cal una manera alternativa d'obtenir ponts."
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,61 +275,61 @@ msgid ""
 "%s, %s or %s."
 msgstr "Una altra manera d'aconseguir ponts Ã©s enviar un correu electrÃ²nic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreÃ§a d'un dels segÃ¼ents proveÃ¯dors de correu:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "No em funcionen els ponts! Ajuda!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, haurÃeu d'enviar un correu a %s."
+msgstr "Si Tor no us funciona, envieu un correu a %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Incloeu el mÃ xim d'informaciÃ³ sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versiÃ³ de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Les vostres lÃnies de ponts:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Descarregueu ponts!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Seleccioneu les opcions pel tipus de pont:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Necessiteu adreces IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necessiteu un %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "El navegador no estÃ  mostrant les imatges correctament."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "IntroduÃ¯u els carÃ cters de la imatge superior..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Com comenÃ§ar a utilitzar els ponts"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -213,21 +338,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "El vostre ProveÃ¯dor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -235,153 +360,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Mostra aquest missatge."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Demanar ponts estÃ ndard."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Demanar ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Fer una cÃ²pia de la clau pÃºblica GnuPG del BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Comunicar un Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Codi font"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Canviar el log"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contacte"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecciona-ho tot"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostra el codi QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Codi QR per les lÃnies de ponts"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ueeeee, espaguetiiiiis!!!!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Hi ha hagut un error en obtenir el codi QR"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Aquest codi QR contÃ© les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mÃ²bil i a altres dispositius. "
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "No hi han ponts disponibles en aquests moments..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Potser hauries de provar %s tirant enrer %s i triant un tipus diferent de pont!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Pas %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarrega %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Pas %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Descarrega %s ponts %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Pas %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ara %s adjunta els ponts al Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust donem els meus bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcions AvanÃ§ades"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "Descarregar una cÃ²pia de la clau pÃºblica GnuPG del BridgeDB."
diff --git a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
index e6d1e84..9a0e93e 100644
--- a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
@@ -6,26 +6,28 @@
 # A5h8d0wf0x <littleslyfoxie28@xxxxxxxxx>, 2014
 # Adam Slovacek <adamslovacek@xxxxxxxxx>, 2013
 # Elisa <valhalla@xxxxxxxxxxxxx>, 2011
+# Filip Hruska <fhr@xxxxxxxxx>, 2015
 # Sanky <gsanky+transifex@xxxxxxxxx>, 2011
 # JiÅ?Ã VÃrava <appukonrad@xxxxxxxxx>, 2014
+# Michal Stanke <mstanke@xxxxxxxxxx>, 2018
 # mxsedlacek, 2014
 # Radek Bensch <inactive+Radog@xxxxxxxxxxxxx>, 2013
-# Tomas Palik <heidfeld@xxxxxxxx>, 2015
-# Vlastimil BuriÃ¡n <burian.vlastimil2@xxxxxxxxx>, 2015
+# Tomas Palik, 2015
+# Vlastimil BuriÃ¡n <inactive+burianvlastimil@xxxxxxxxxxxxx>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 20:57+0000\n"
-"Last-Translator: Vlastimil BuriÃ¡n <burian.vlastimil2@xxxxxxxxx>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-25 18:02+0000\n"
+"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>\n"
+"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -38,68 +40,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "PromiÅ?te! NÄ?co se stalo Å¡patnÄ? s vaÅ¡Ãm poÅ¾adavkem."
+msgstr "PromiÅ?te. VÃ¡Å¡ poÅ¾adavek se nepodaÅ?ilo provÃ©st."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "NahlÃ¡sit chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ZdrojovÃ½ kÃ³d"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Seznam zmÄ?n"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄ?it vÅ¡e"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Zobrazit QR kÃ³d"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kÃ³d pro vaÅ¡e linky k mostÅ¯m"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "JeÅ¾ÃÅ¡ku na kÅ?ÃÅ¾ku!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "PÅ?i zpracovÃ¡nÃ vaÅ¡eho QR kÃ³du zÅ?ejmÄ? nastala chyba."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tento QR kÃ³d obsahuje linky pro vÃ¡Å¡ most. Pro zkopÃrovÃ¡nÃ na mobilnÃ nebo jinÃ¡ zaÅ?ÃzenÃ naskenujte QR kÃ³d Ä?teÄ?kou."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "NynÃ nejsou k dispozici Å¾Ã¡dnÃ© mosty..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "MoÅ¾nÃ¡ by jste mÄ?l zkusit %s jÃt zpÄ?t %s a vybrat jinÃ½ typ mostÅ¯!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "StÃ¡hnout %sprohlÃÅ¾eÄ? Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskat %s mosty %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "NynÃ %s pÅ?idejte mosty do prohlÃÅ¾eÄ?e Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sen mi dejte mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "RozÅ¡ÃÅ?enÃ¡ nastavenÃ"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Å¾Ã¡dnÃ©"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sA%sno!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastavit mosty"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Toto je automatickÃ¡ zprÃ¡va; prosÃm, neodpovÃdejte na ni]"
+msgstr "[Toto je automatickÃ¡ zprÃ¡va. NeodpovÃdejte na ni prosÃm.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Zde jsou vaÅ¡e mosty:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "PÅ?ekroÄ?il jste meznÃ limit. ProsÃme zpomalte! MinimÃ¡lnÃ Ä?as nezi emaily je %s hodin. VÅ¡echny nÃ¡sledujÃcÃ emaily bÄ?hem tÃ©to Ä?asovÃ© doby budou ignorovÃ¡ny."
+msgstr "PÅ?ekroÄ?ili jste limit poÄ?tu poÅ¾adavkÅ¯. Zpomalte prosÃm. MinimÃ¡lnÃ Ä?as mezi e-maily je %s hodin. VÅ¡echny nÃ¡sledujÃcÃ e-maily bÄ?hem tÃ©to Ä?asovÃ© doby budou ignorovÃ¡ny."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "PÅ?Ã?KAZY: (kombinujte pÅ?Ãkazy pro zadÃ¡vÃ¡nÃ vÃce moÅ¾nostÃ souÄ?asnÄ?)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "VÃtejte v BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "V souÄ?asnosti podporovanÃ© transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hey, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ahoj, pÅ?Ãteli!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "VeÅ?ejnÃ© klÃÄ?e"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Tento email byl generovÃ¡n s duhou, jednoroÅ¾ci a jiskÅ?iÄ?kami\npro %s data  %s v %s"
+msgstr "Tento duhovÃ½ e-mail plnÃ½ jednoroÅ¾cÅ¯ a hvÄ?zd byl generovÃ¡n pro %s dne %s v %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,283 +234,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB mÅ¯Å¾e nabÃdnou mosty s nÄ?kolika %stypes of Pluggable Transports%s,\ncoÅ¾ mÅ¯Å¾e pomoci zmÃ¡st vaÅ¡e pÅ?ipojenÃ k Tor Network, a udÄ?lat sloÅ¾itÄ?jÅ¡Ã pro kohokoli\nsledovat vaÅ¡i internetovou aktivitu k urÄ?enÃ zda pouÅ¾ÃvÃ¡te Tor.\n\n"
+msgstr "BridgeDB mÅ¯Å¾e nabÃdnou mosty s nÄ?kolika %s typy Pluggable Transports%s,\ncoÅ¾ mÅ¯Å¾e zamaskovat vaÅ¡e pÅ?ipojenÃ k sÃti Tor a znesnadnit pro kohokoli\nsledovat vaÅ¡i internetovou aktivitu a urÄ?it, zda Tor pouÅ¾ÃvÃ¡te\nnebo nikoliv.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "NÄ?ktetÃ© mosty s IPv6 adresami jsou takÃ© k dispozici, pÅ?estoÅ¾e nÄ?kterÃ© Pluggable Transports\nnejsou kompaktibilnÃ s IPv6.\n"
+msgstr "K dispozici jsou takÃ© nÄ?kterÃ© mosty s IPv6 adresami, pÅ?estoÅ¾e nÄ?kterÃ© Pluggable Transports\nnejsou s IPv6 kompatibilnÃ.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "DodateÄ?nÄ?, BridgeDB mÃ¡ spustu nudnÃ½ch vanilkovÃ½ch mostÅ¯ %s bez Å¾Ã¡dnÃ½ch \nPluggable Transports %s coÅ¾ sice nemusÃ znÃt tak super, ale ÃºpoÅ?Ã¡d mohou\npomoci obejÃt internetovou cenzuru v mnoha pÅ?Ãpadech.\n\n"
+msgstr "BridgeDB mÃ¡ takÃ© spoustu obyÄ?ejnÃ½ch mostÅ¯ %s bez Å¾Ã¡dnÃ½ch \nPluggable Transports %s. To sice nemusÃ znÃt tak super, ale poÅ?Ã¡d vÃ¡m mohou v mnoha pÅ?Ãpadech\npomoci obejÃt internetovou cenzuru.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Co jsou mosty?"
+msgstr "Co jsou to mosty?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Mosty %s jsou Tor pÅ?enosy kterÃ© vÃ¡m pomÃ¡hajÃ obejÃt cenzuru."
+msgstr "%s Mosty %s jsou uzly Toru, kterÃ© vÃ¡m pomÃ¡hajÃ obejÃt cenzuru."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Chci mosty zjistit jinÃ½m zpÅ¯sobem!"
+msgstr "PotÅ?ebuji jinÃ½ zpÅ¯sob jak zÃskat most!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "DalÅ¡Ã zpÅ¯sob jak dostat mosty je poslat email na %s. ProsÃme mÄ?jte na pamÄ?ti Å¾e musÃte poslat email pouze z adresy od nÃ¡sledujÃcÃch poskytovatelÅ¯ emailu:\n%s, %s nebo %s."
+msgstr "DalÅ¡Ã zpÅ¯sob, jak zÃskat mosty, je poslat e-mail na %s. MÄ?jte prosÃm na pamÄ?ti, Å¾e musÃte poslat e-mail pouze ze schrÃ¡nky nÃ¡sledujÃcÃch poskytovatelÅ¯ e-mailovÃ½ch sluÅ¾eb:\n%s, %s nebo %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "MÃ© mosty nefungujÃ. PotÅ?ebuji pomoc!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud vÃ¡Å¡ Tor nepracuje mÄ?l by jste nÃ¡m poslat email %s."
+msgstr "Pokud vÃ¡m Tor nefunguje, poÅ¡lete nÃ¡m e-mail na %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Pokuste se popsat co nejvÃce informacÃ o vaÅ¡em pÅ?Ãpadu, vÄ?etnÄ? listu\nmostÅ¯ a pluggable Transports kterÃ© jste se pokusili pouÅ¾Ãt, vaÅ¡i verzi Tor Browser,\na jakÃ© Tor poslal ven, atd."
+msgstr "NapiÅ¡te nÃ¡m co nejvÃce o vaÅ¡em problÃ©mu, vÄ?etnÄ? seznamu\nmostÅ¯ a pluggable Transports, kterÃ© jste se pokusili pouÅ¾Ãt, vaÅ¡i verzi prohlÃÅ¾eÄ?e Tor,\nvÅ¡echny zprÃ¡vy, kterÃ© jste od Toru zÃskali, atd."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Zde jsou vaÅ¡e linky k mostÅ¯m: "
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "ZÃskejte Mosty!"
+msgstr "ZÃskat mosty!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "ProsÃm vyberte nastavenÃ pro typ mostÅ¯:"
+msgstr "Vyberte ÃºrosÃm nastavenÃ pro typ mostu:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "PotÅ?ebujete IPv6 adresu?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "PotÅ?ebujete %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "VÃ¡Å¡ prohlÃÅ¾eÄ? nezobrazuje obrÃ¡zky sprÃ¡vnÄ?."
+msgstr "VÃ¡Å¡ prohlÃÅ¾eÄ? nezobrazuje sprÃ¡vnÄ? obrÃ¡zky."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "VloÅ¾te pÃsmena z obrÃ¡zku vÃ½Å¡e..."
+msgstr "Zadejte pÃsmena z obrÃ¡zku vÃ½Å¡e..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Jak zaÄ?Ãt pouÅ¾Ãvat mosty."
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Chcete-li zadat mosty do Tor Browser, jdÄ?te nejprve do %s Tor Browser strÃ¡nky\nke staÅ¾enÃ %s, a pak postupujte podle pokynÅ¯ pro staÅ¾enÃ a spuÅ¡tÄ?nÃ\nTor Browser."
+msgstr "K vloÅ¾enÃ mostÅ¯ do prohlÃÅ¾eÄ?e Tor, postupujte podle instrukcÃ ke staÅ¾enÃ a spuÅ¡tÄ?nÃ na %s strÃ¡nce\nke staÅ¾enÃ prohlÃÅ¾eÄ?e Tor %s."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "KdyÅ¾ dialog 'Tor NastavenÃ SÃtÄ?' vyskoÄ?Ã kliknÄ?te na 'Konfigurovat' a postupujte\npodle prÅ¯vodce dokud nedostanete otÃ¡zku:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Blokuje nebo cenzoruje vÃ¡Å¡ Poskytovatel SluÅ¾eb Internetu (ISP) pÅ?ipojenÃ k\nTor sÃti?"
+msgstr "Blokuje nebo jinak cenzuruje vÃ¡Å¡ poskytovatel internetovÃ©ho pÅ?ipojenÃ (ISP) spojenÃ se sÃtÃ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vyberte 'Ano' a potÃ© kliknÄ?te 'DalÅ¡Ã'. Pro konfiguraci novÃ½ch mostÅ¯ kopÃrujte a\nvloÅ¾te linky k mostÅ¯m do textovÃ©ho pole pro vloÅ¾enÃ. Nakonec kliknÄ?te na 'PÅ?ipojit' a\nmÄ?lo by to bÃ½t vÅ¡echno! Pokud narazÃte na problÃ©my, zkuste kliknout na tlaÄ?Ãtko 'Pomoc'\nv 'Tor NastavenÃ SÃtÄ?' prÅ¯vodce pro dalÅ¡Ã pomoc."
+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'."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "ZobrazÃ tuto zprÃ¡vu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "PoÅ¾adovat vanilla mosty."
+msgstr "PoÅ¾Ã¡dat o obyÄ?ejnÃ© mosty."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "PoÅ¾adovat IPv6 mosty."
+msgstr "PoÅ¾Ã¡dat o IPv6 mosty."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "PoÅ¾adovat Pluggable Transport od TYPE."
+msgstr "PoÅ¾Ã¡dat o Pluggable Transport s TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "ZÃskat kopii BridgeDS's veÅ?ejnÃ©ho GnuPg klÃÄ?e. "
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "NahlÃ¡sit chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ZdrojovÃ½ kÃ³d"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Seznam zmÄ?n"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "OznaÄ?it vÅ¡e"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Zobrazit QR kÃ³d"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kÃ³d pro VaÅ¡e linky k mostÅ¯m"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "JeÅ¾ÃÅ¡ku na kÅ?ÃÅ¾ku!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "ZdÃ¡ se, Å¾e nastala chyba pÅ?i zpracovÃ¡nÃ VaÅ¡eho QR kÃ³du"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Tento QR kÃ³d obsahuje linky pro VÃ¡Å¡ most. Naskenujte ho Ä?teÄ?kou QR kÃ³dÅ¯, abyste je zkopÃrovali na mobil nebo jinÃ¡ zaÅ?ÃzenÃ."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "V souÄ?asnosti zde nejsou Å¾Ã¡dnÃ© mosty k dispozici..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "MoÅ¾nÃ¡ by jste mÄ?l zkusit %s jÃt zpÄ?t %s a vybrat jinÃ½ typ mostÅ¯!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "StÃ¡hnout %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ZÃskej %s mosty %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "NynÃ %s pÅ?idejte mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sen mi dejte mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "RozÅ¡ÃÅ?enÃ© moÅ¾nosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastavit Bridges"
+msgstr "ZÃskat kopii veÅ?ejnÃ©ho GnuPG klÃÄ?e BridgeDB."
diff --git a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
index 6f61862..c377a7d 100644
--- a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
@@ -6,21 +6,23 @@
 # Christian Villum <villum@xxxxxxxxxxx>, 2014-2015
 # David Nielsen <gnomeuser@xxxxxxxxx>, 2014
 # Mogelbjerg <jan@xxxxxxxxxxxxx>, 2015
+# Lasse MÃ¸ller <hal9k@xxxxxxxxxx>, 2016
+# scootergrisen, 2017-2018
 # OliverMller <theoliver@xxxxxxxxxx>, 2011
 # Thomas Pryds <thomas@xxxxxxxx>, 2014
 # Tore BjÃ¸rnson <tore.bjornson@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-04 15:32+0000\n"
-"Last-Translator: Mogelbjerg <jan@xxxxxxxxxxxxx>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-17 02:20+0000\n"
+"Last-Translator: scootergrisen\n"
+"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -35,68 +37,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Beklager, noget gik galt med din anmodning."
+msgstr "Beklager. Noget gik galt med din anmodning."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "RapportÃ©r en fejl"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ã?ndringslog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Marker alle"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode for dine brolinjer"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups, vi stÃ¥r i lort til halsen!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-lÃ¦ser for at kopiere dine brolinjer over til mobile og andre enheder."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Du kunne mÃ¥se prÃ¸ve %s at gÃ¥ tilbage %s og vÃ¦lge en anden brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Trin %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Trin %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "FÃ¥ %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Trin %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s TilfÃ¸j broer til Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sare giv mig broer!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avancerede indstillinger"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nej"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ingen"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sent broer"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Dette er en automatisk meddelelse; Svar venligst ikke.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Her er dine broer:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har overskredet ratebegrÃ¦nsningen. SÃ¦nk venligst hastigheden! Den minimale tid mellem\nemails er %s timer. Yderligere emails sendt i denne period vil blive ignoreret."
+msgstr "Du har overskredet ratebegrÃ¦nsningen. SÃ¦nk venligst hastigheden! Den minimale tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i denne periode vil blive ignoreret."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder pÃ¥ en gang)"
+msgstr "COMMANDs: (kombiner COMMANDs for at angive flere valgmuligheder samtidigt)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Velkommen til BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs som er understÃ¸ttet i Ã¸jeblikket:"
+msgstr "Transport TYPE'er som er understÃ¸ttet i Ã¸jeblikket:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hej %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hej min ven!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸gler"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Denne email til %s blev skabt ved hjÃ¦lp af regnbuer, enhjÃ¸rninger og glitter %s klokken %s."
+msgstr "Denne e-mail til %s blev skabt ved hjÃ¦lp af regnbuer,\nenhjÃ¸rninger og glitter %s klokken %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,283 +231,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s som kan hjÃ¦lpe med at slÃ¸re dine forbindelser til Tor netvÃ¦rket, og dermed gÃ¸re det vanskeligere for nogen som kan se din internet trafik at bestemme at du bruger Tor.\n"
+msgstr "BridgeDB kan formidle broer med adskillige typer %sUdskiftelige transporter%s\nsom kan hjÃ¦lpe med at slÃ¸re dine forbindelser til Tor-netvÃ¦rket, og dermed\ngÃ¸re det vanskeligere for nogen som kan se din internet trafik at bestemme\nat du bruger Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Nogle broer med IPv6 adresser er ogsÃ¥ tilgÃ¦ngelige, men ikke alle Pluggable\nTransports understÃ¸tter IPv6.\n\n"
+msgstr "Nogle broer med IPv6-adresser er ogsÃ¥ tilgÃ¦ngelige, men ikke alle udskiftelige\ntransporter understÃ¸tter IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen Pluggable Transports %s hvilket mÃ¥ske ikke lyder sÃ¥ smart, men de kan stadigvÃ¦k hjÃ¦lpe med at omgÃ¥ internet censur i mange tilfÃ¦lde.\n"
+msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket mÃ¥ske ikke lyder sÃ¥ smart, men de kan\nstadigvÃ¦k hjÃ¦lpe med at omgÃ¥ internet censur i mange tilfÃ¦lde.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Hvad er broer?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s broer %s er Tor relÃ¦er som hjÃ¦lper dig med at omgÃ¥ censur."
+msgstr "%s Broer %s er Tor-relÃ¦er som hjÃ¦lper dig med at omgÃ¥ censur."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg har brug for en alternativ metode til at fÃ¥ broer pÃ¥!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "En anden mÃ¥de at finde broer er at sende en email til %s. BemÃ¦rk venligst at du skal\nsende mailen fra en konto hos en af de fÃ¸lgende email-udbydere:\n%s, %s eller %s."
+msgstr "En anden mÃ¥de at finde broer er at sende en e-mail til %s. BemÃ¦rk venligst at du skal\nsende mailen fra en konto hos en af de fÃ¸lgende e-mailudbydere:\n%s, %s eller %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis Tor ikke virker for dig kan du  sende en email til %s."
+msgstr "Hvis Tor ikke virker for dig kan du sende en e-mail til %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v at inkluderer sÃ¥ meget information om din sag som muligt, der i blandt: En liste af broer og Pluggable Transports du har prÃ¸vet at bruge, din Tor Browser version, hvilke beskeder Tor gav, etc."
+msgstr "PrÃ¸v at inkluderer sÃ¥ meget information om din sag som muligt, der i blandt:\nEn liste af broer og udskiftelige transporter du har prÃ¸vet at bruge, din\nTor Browser-version, hvilke beskeder Tor gav, osv."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro linjer:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Find broer!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "VÃ¦lg venligst brotype muligheder:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Har du brug for IPv6 adresser?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Har du brug for en %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Din browser kan ikke vise billeder korrekt."
+msgstr "Din browser kan ikke vise billeder ordentligt."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Indtast tegnene fra billedet ovenfor..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "SÃ¥dan starter du med at bruge dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "For at tage broer ind i Tor-browseren, gÃ¥ da fÃ¸rst til %s Tor-bowsers\ndownloadside %s og fÃ¸lg instruktionerne i hvordan Tor-browseren \ndownloades og startes."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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' vinduet popper op, klik 'Indstil' og fÃ¸lg guiden til den siger:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Blokerer eller pÃ¥ anden vis censurerer din internetudbyder forbindelser\ntil Tor netvÃ¦rket?"
+msgstr "Blokerer eller pÃ¥ anden vis censurerer din internetudbyder forbindelser\ntil Tor-netvÃ¦rket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "VÃ¦lg 'Ja' og klik sÃ¥ pÃ¥ 'NÃ¦ste'. For at konfigurere dine nye broer, kopier og indsÃ¦t brolinierne i den nÃ¦ste input boks. Klik til sidst 'Forbind', og sÃ¥ er du klar! Hvis du stÃ¸der pÃ¥ problemer, sÃ¥ prÃ¸v at klikke pÃ¥ 'HjÃ¦lp'-knappen i 'Tor NetvÃ¦rksindstillinger'-guiden for at fÃ¥ yderligere hjÃ¦lp."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Vis denne besked."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Anmod almindelige broer."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Amod IPv6 broer."
+msgstr "Anmod IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Anmod om Pluggable Transport efter TYPE."
+msgstr "Anmod om udskiftelig transport efter TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nÃ¸gle."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporter en fejl"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kildekode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ã?ndringer"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Marker alle"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Vis QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode for dine brolinier."
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ups, vi stÃ¥r i lort til halsen"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Denne QRCode indeholder dine brolinier. Scan den med en QRCode-lÃ¦ser for at kopiere dine brolinier over til mobile og andre enheder."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Du kunne mÃ¥se prÃ¸ve %s at gÃ¥ tilbage %s og vÃ¦lge en anden brotype!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Trin %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Hent %s Tor Browseren %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Trin %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "FÃ¥ %s broer %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Trin %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "TilfÃ¸j nu %s broer til Tor Browseren %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sare giv mig bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Advancerede indstillinger"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nej"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sent Bridges"
diff --git a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
index 67f5afb..e28fdef 100644
--- a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
@@ -3,31 +3,34 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Christian Kaindl <crisscross.kaindl@xxxxxxxxxx>, 2015
 # trantor <clucko3@xxxxxxxxx>, 2014
 # Ettore Atalan <atalanttore@xxxxxxxxxxxxxx>, 2014
 # jschfr <hello@xxxxxxxxxxxxxxx>, 2015
 # unknwon_anonymous <jackjohnson0001@xxxxxxxxx>, 2014
 # Junge Limba <jungelimba@xxxxxxxxx>, 2015
-# konstibae <konstibae@xxxxxxxxx>, 2014
+# Konstantin BB, 2014
 # Locke <locke@xxxxxxxxxxxxxx>, 2011
 # qbi <kubieziel@xxxxxxxxxxxxxx>, 2015
+# Roland Illig <roland.illig@xxxxxx>, 2018
 # Sebastian <sebix+transifex@xxxxxxxx>, 2015
 # debakel <spam1@xxxxxxx>, 2014
 # Tobias Bannert <tobannert@xxxxxxxxx>, 2013
 # Tobias Bannert <tobannert@xxxxxxxxx>, 2014
-# Toralf FÃ¶rster <toralf.foerster@xxxxxx>, 2015
+# Toralf FÃ¶rster <inactive+toralf@xxxxxxxxxxxxx>, 2015
+# try once, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 18:33+0000\n"
-"Last-Translator: Toralf FÃ¶rster <toralf.foerster@xxxxxx>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-06-11 23:31+0000\n"
+"Last-Translator: Roland Illig <roland.illig@xxxxxx>\n"
+"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -42,57 +45,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Einen Fehler melden"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Quellcode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ã?nderungsprotokoll"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Alles auswÃ¤hlen"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRCode anzeigen"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode fÃ¼r Ihre BrÃ¼ckenverbindungen"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh, es ist etwas schief gegangen!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Dieser QR-Code beinhaltet Ihre BrÃ¼ckenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre BrÃ¼ckenverbindungen auf ihre mobile und andere GerÃ¤te zu kopieren."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Im Moment sind keine BrÃ¼cken verfÃ¼gbar â?¦"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "MÃ¶glicherweise sollten Sie versuchen %s zurÃ¼ckzugehen %s und einen anderen BrÃ¼ckentyp auszuwÃ¤hlen!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Schritt %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s herunterladen"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Schritt %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s BrÃ¼cken %s erhalten"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Schritt %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sM%sir nur BrÃ¼cken geben!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Erweiterte Optionen"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nein"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "keine"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sB%srÃ¼cken erhalten"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Das ist eine automatische Nachricht. Bitte antworten Sie nicht darauf.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Hier sind Ihre BrÃ¼cken-Server (Bridges):"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Sie haben den Grenzwert Ã¼berschritten. Bitte verlangsamen! Der kleinste Abstand zwischen \nden E-Mails betrÃ¤gt %s Stunden. Alle weiteren E-Mails, wÃ¤hrend dieser Zeit, werden ignoriert."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Befehle: (Befehle kombinieren, um mehrere Optionen gleichzeitig anzugeben)"
+msgstr "BEFEHLE: (Kombinieren Sie BEFEHLE um mehrere MÃ¶glichkeiten gleichzeitig anzugeben)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr "Willkommen bei der BrÃ¼ckendatenbank!"
+msgstr "Willkommen bei BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Aktuell unterstÃ¼tzte Transporttypen:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hallo, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hallo Freund!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ã?ffentliche SchlÃ¼ssel"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -103,7 +231,7 @@ msgstr "Diese E-Mail wurde fÃ¼r %s am %s um %s mit Regenbogen, EinhÃ¶rnern und G
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -111,10 +239,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "Die BrÃ¼ckendatenbank kann BrÃ¼cken-Server mit verschiedenen %stypen der Pluggable Transports%s bereitstellen. Diese kÃ¶nnen helfen, Ihre Verbindungen zum Tor-Netzwerk zu verschleiern. Damit wird es fÃ¼r Dritte schwieriger festzustellen, dass sie Tor benutzen.\n\n"
+msgstr "BridgeDB kann BrÃ¼cken-Server mit verschiedenen %stypen der Pluggable Transports%s\nbereitstellen. Diese kÃ¶nnen helfen, Ihre Verbindungen zum Tor Network zu verschleiern. Damit wird es fÃ¼r Dritte schwieriger\nfestzustellen, dass Sie\nTor benutzen.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -126,7 +254,7 @@ msgstr "Einige BrÃ¼cken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn ei
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -135,20 +263,20 @@ msgid ""
 "\n"
 msgstr "ZusÃ¤tzlich hat die BridgeDB viele herkÃ¶mmliche BrÃ¼cken-Server %s ohnePluggable Transports %s. Das klingt erst einmal nicht so besonders. Es hilft Ihnen dennoch, in vielen FÃ¤llen die Internetzensur zu umgehen.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Was sind BrÃ¼cken?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s BrÃ¼cken-Server %s sind Tor-Relais, die Ihnen dabei helfen, die Zensur zu umgehen."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ich brauche einen anderen Weg, um Adressen von BrÃ¼cken-Servern zu erhalten."
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -156,12 +284,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Sie kÃ¶nnen auch eine E-Mail an %s schicken, um Adressen von BrÃ¼cken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s."
@@ -169,48 +297,48 @@ msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail a
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Versuchen Sie in Ihrer E-Mail mÃ¶glichst viele Informationen Ã¼ber Ihr Problem einzubeziehen, \neinschlieÃ?lich einer Liste der BrÃ¼cken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hier sind Ihre BrÃ¼ckenadressen:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Erhalten Sie Adressen von BrÃ¼cken-Servern!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Bitte wÃ¤hlen Sie die Optionen fÃ¼r den BrÃ¼ckentyp aus:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "BenÃ¶tigen Sie IPv6-Adressen?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BenÃ¶tigen Sie eine %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "So starten Sie die Benutzung Ihrer BrÃ¼cken"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -219,21 +347,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -241,153 +369,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Diese Nachricht anzeigen."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Standard-BrÃ¼cken anfordern."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPv6-BrÃ¼cken anfordern."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Einen Pluggable Transport des TYPs anfordern."
+msgstr "Einen Pluggable Transport des TYPEs anfordern."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Eine Kopie des Ã¶ffentlichen GnuPG-SchlÃ¼ssels der BrÃ¼ckendatenbank erhalten."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Einen Fehler melden"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Quellcode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ã?nderungsprotokoll"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Alles auswÃ¤hlen"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QRCode anzeigen"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode fÃ¼r Ihre BrÃ¼ckenverbindungen"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Hoppla, Spaghetti!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Dieser QR-Code beinhaltet Ihre BrÃ¼ckenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre BrÃ¼ckenverbindungen auf ihre mobile und andere GerÃ¤te zu kopieren."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Im Moment sind keine BrÃ¼cken verfÃ¼gbar â?¦"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "MÃ¶glicherweise sollten Sie versuchen %s zurÃ¼ckzugehen %s und einen anderen BrÃ¼ckentyp auszuwÃ¤hlen!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Schritt %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s herunterladen"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Schritt %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s BrÃ¼cken %s erhalten"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Schritt %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Jetzt %s bitte die BrÃ¼cken zum Tor-Browser hinzufÃ¼gen %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sM%sir nur BrÃ¼cken geben!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Erweiterte Optionen"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nein"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sB%srÃ¼cken erhalten"
diff --git a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
index bbbbe92..91fc639 100644
--- a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
@@ -1,28 +1,35 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
 # Adrian Pappas <pappasadrian@xxxxxxxxx>, 2014
+# Aikaterini Katmada, 2015
 # andromeas <andromeas@xxxxxxxxxxx>, 2014
+# A Papac <ap909219@xxxxxxxxxxxxxx>, 2018
 # oahanx, 2014
-# isv31 <ix4svs@xxxxxxxxx>, 2014
+# Ilias Giannaros <iliasgnrs@xxxxxxxxx>, 2015
+# isv31 <36b043a6@xxxxxxxxxxxxxxx>, 2014
 # kotkotkot <kotakota@xxxxxxxxx>, 2013
 # kotkotkot <kotakota@xxxxxxxxx>, 2012
-# mitzie <zacharias.mitzelos@xxxxxxxxx>, 2013
+# LOUKAS SKOUROLIAKOS, 2015
+# Orion Belt <orionbelt2@xxxxxxxxx>, 2018
+# Panos <alwayslivid@xxxxxxxxxxxxxx>, 2018-2019
+# Sofia K., 2018
+# mitzie <accounts@xxxxxxxxxxxx>, 2013
 # Wasilis Mandratzis <inactive+Wasilis@xxxxxxxxxxxxx>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2014-10-15 17:11+0000\n"
-"Last-Translator: oahanx\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -37,68 +44,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Î£Ï?Î³Î³Î½Ï?Î¼Î·! Î?Î¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬ Î¼Îµ Ï?Î¿ Î±Î¯Ï?Î·Î¼Î± Ï?Î±Ï?."
+msgstr "Î£Ï?Î³Î½Ï?Î¼Î·! Î?Î¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬ Î¼Îµ Ï?Î¿ Î±Î¯Ï?Î·Î¼Î¬ Ï?Î±Ï?."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Î?Ï?Î±Ï?Î®"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Î?Ï?Î¹Î»Î¿Î³Î® Ï?Î»Ï?Î½"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Î?Î¼Ï?Î¬Î½Î¹Ï?Î·  QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Î?Ï?Ï?Ï?, ÎºÎ¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Î?Ï?Ï? Ï?,Ï?Î¹ Ï?Î±Î¯Î½ÎµÏ?Î±Î¹, Ï?Ï?Î®Ï?Î¾Îµ ÎÎ½Î± Ï?Ï?Ï?Î²Î»Î·Î¼Î± ÎºÎ±Ï?Î¬ Ï?Î·Î½ Î±Î½Î¬ÎºÏ?Î·Ï?Î· Ï?Î¿Ï? QRCode Ï?Î±Ï?. "
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Î?Ï?Ï?Ï? Ï?Î¿ QRCode Ï?ÎµÏ?Î¹ÎÏ?ÎµÎ¹ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï?. Î?Î¹Î±Î²Î¬Ï?Ï?Îµ Ï?Î¿ Î¼Îµ ÎÎ½Î± QRCode scanner Î³Î¹Î± Î½Î± Î±Î½Ï?Î¹Î³Ï?Î¬Ï?ÎµÏ?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î³ÎÏ?Ï?Ï?Î±Ï? Ï?Îµ ÎºÎ¹Î½Î®Ï?Î· ÎºÎ±Î¹ Î¬Î»Î»Î· Ï?Ï?Ï?ÎºÎµÏ?Î®."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î´Î¹Î±Î¸ÎÏ?Î¹Î¼ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Î?Î¿ÎºÎ¹Î¼Î¬Ï?Ï?Îµ Î½Î± %s Ï?Î¬Ï?Îµ Ï?Î¯Ï?Ï? %s ÎºÎ±Î¹ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Î´Î¹Î±Ï?Î¿Ï?ÎµÏ?Î¹ÎºÏ? Ï?Ï?Ï?Î¿ Î³ÎÏ?Ï?Ï?Î±Ï?!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Î?Î®Î¼Î± %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Î?Î®Î¼Î± %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Î?Ï?Î¿ÎºÏ?Î®Ï?Ï?Îµ Ï?Î¹Ï? %s Î³ÎÏ?Ï?Ï?ÎµÏ?%s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Î?Î®Î¼Î± %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿Î½ Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÎ?%sÏ?Î»Ï?Ï? Î´Ï?Ï?Îµ Î¼Î¿Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Î?Ï?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Î?Ï?Î¹"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ÎºÎ±Î½ÎÎ½Î±"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÎ?%sÎ±Î¹!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÎ?%sÎ®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Î?Ï?Ï?Ï? ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î±Ï?Ï?Î¿Î¼Î±Ï?Î¿Ï?Î¿Î¹Î·Î¼ÎµÎ½Î¿ Î¼Î®Î½Ï?Î¼Î±, Ï?Î±Ï?Î±ÎºÎ±Î»Î¿Ï?Î¼Îµ Î¼Î·Î½ Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ]"
+msgstr "[Î?Ï?Ï?Ï? ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î±Ï?Ï?Î¿Î¼Î±Ï?Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿ Î¼Î®Î½Ï?Î¼Î±Â· Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Î¼Î·Î½ Î±Ï?Î±Î½Ï?Î®Ï?ÎµÏ?Îµ.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Î?Î´Ï? ÎµÎ¯Î½Î±Î¹ Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Î±Ï?:"
+msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Î?ÎµÏ?ÎÏ?Î±Ï?ÎµÏ? Ï?Î¿ Ï?Ï?Î¹Î¿. Î Î±Ï?Î±ÎºÎ±Î»Ï?, Ï?Î¹Ï? Î±Ï?Î³Î¬! Î? ÎµÎ»Î¬Ï?Î¹Ï?Ï?Î¿Ï? Ï?Ï?Ï?Î½Î¿Ï? Î¼ÎµÏ?Î±Î¾Ï? Î´Î¹Î±Î´Î¿Ï?Î¹ÎºÏ?Î½ email\n ÎµÎ¯Î½Î±Î¹ %s Ï?Ï?ÎµÏ?. Î?Î»Î± Ï?Î± ÎµÎ½Î´Î¹Î¬Î¼ÎµÏ?Î± email Ï?Îµ Î±Ï?Ï?Ï? Ï?Î¿ Ï?Ï?Î¿Î½Î¹ÎºÏ? Î´Î¹Î¬Ï?Ï?Î·Î¼Î± Î¸Î± Î±Î³Î½Î¿Î¿Ï?Î½Ï?Î±Î¹."
+msgstr "Î?ÎµÏ?ÎµÏ?Î¬Ï?Î±Ï?Îµ Ï?Î¿ Ï?Ï?Î¹Î¿. Î Î±Ï?Î±ÎºÎ±Î»Ï?, Ï?Î¹Î¿ Î±Ï?Î³Î¬! Î? ÎµÎ»Î¬Ï?Î¹Ï?Ï?Î¿Ï? Ï?Ï?Ï?Î½Î¿Ï? Î¼ÎµÏ?Î±Î¾Ï? Î´Î¹Î±Î´Î¿Ï?Î¹ÎºÏ?Î½ email\n ÎµÎ¯Î½Î±Î¹ %s Ï?Ï?ÎµÏ?. Î?Î»Î± Ï?Î± ÎµÎ½Î´Î¹Î¬Î¼ÎµÏ?Î± email Ï?Îµ Î±Ï?Ï?Ï? Ï?Î¿ Ï?Ï?Î¿Î½Î¹ÎºÏ? Î´Î¹Î¬Ï?Ï?Î·Î¼Î± Î¸Î± Î±Î³Î½Î¿Î¿Ï?Î½Ï?Î±Î¹."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "Î?Î?Î¤Î?Î?Î?Î£: (Ï?Ï?Î½Î´Ï?Î¬Ï?Ï?Îµ Î?Î?Î¤Î?Î?Î?Î£ Î³Î¹Î± Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Ï?Î¿Î»Î»Î±Ï?Î»ÎÏ? Ï?Î±Ï?Î±Î¼ÎÏ?Ï?Î¿Ï?Ï? Ï?Î±Ï?Ï?Ï?Ï?Ï?Î¿Î½Î±)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Î?Î±Î»Ï?Ï? Î®Ï?Î¸Î±Ï?Îµ Ï?Ï?Î¿ BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Î¥Ï?Î¿Ï?Ï?Î·Ï?Î¹Î¶Ï?Î¼ÎµÎ½Î± transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "Î?ÎµÎ¹Î¬ Ï?Î¿Ï?, %s!"
+msgstr "Î?ÎµÎ¹Î¬ Ï?Î±Ï?, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Î?ÎµÎ¹Î± Ï?Î¿Ï?, Ï?Î¯Î»Îµ!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Î?Î·Î¼Ï?Ï?Î¹Î± Î?Î»ÎµÎ¹Î´Î¹Î¬"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Î?Ï?Ï?Ï? Ï?Î¿ email Ï?Î±Ï?Î®Ï?Î¸Î· Î¼Îµ Î±Î³Î¬Ï?Î·, Î¿Ï?Ï?Î¬Î½Î¹Î± Ï?Ï?Î¾Î± ÎºÎ±Î¹ Ï?Ï?Ï?Ï?Ï?Ï?ÎºÎ¿Î½Î·\nÎ³Î¹Î± Ï?Î¿Î½/Ï?Î·Î½ %s, %s Ï?Ï?Î¹Ï? %s."
+msgstr "Î?Ï?Ï?Ï? Ï?Î¿ email Ï?Î±Ï?Î®Ï?Î¸Î· Î¼Îµ Î±Î³Î¬Ï?Î·, Î¿Ï?Ï?Î¬Î½Î¹Î± Ï?Ï?Î¾Î± ÎºÎ±Î¹ Ï?Ï?Ï?Ï?Ï?Ï?ÎºÎ¿Î½Î·\nÎ³Î¹Î± Ï?Î¿Î½/Ï?Î·Î½ %s, Ï?Î·Î½ %s Ï?Ï?Î¹Ï? %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,22 +238,22 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "Î? BridgeDB Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î±Ï?ÎÏ?ÎµÎ¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹Î¬Ï?Î¿Ï?Î¿Ï?Ï? %sÏ?Ï?Ï?Î¿Ï?Ï? Pluggable Transports%s,\nÏ?Î± Î¿Ï?Î¿Î¯Î± Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± ÎºÏ?Ï?Ï?Î¿Ï?Î½ Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Î±Ï? Ï?Ï?Î¿ Tor Network, ÎºÎ¬Î½Î¿Î½Ï?Î¬Ï? Ï?Î¿ Î´Ï?Ï?ÎºÎ¿Î»Ï?Ï?ÎµÏ?Î¿ Î³Î¹Î± ÎºÎ¬Ï?Î¿Î¹Î¿Î½ Ï?Î¿Ï? Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸ÎµÎ¯ Ï?Î· Î´Î¹ÎºÏ?Ï?Î±ÎºÎ® Î´Ï?Î±Ï?Ï?Î·Ï?Î¹Ï?Ï?Î·Ï?Î¬ Ï?Î±Ï? Î½Î± ÎºÎ±Ï?Î±Î»Î¬Î²ÎµÎ¹ Ï?Ï?Ï? Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Tor.\n\n"
+msgstr "Î? BridgeDB Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î±Ï?ÎÏ?ÎµÎ¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹Î¬Ï?Î¿Ï?Î¿Ï?Ï? %sÏ?Ï?Ï?Î¿Ï?Ï? Pluggable Transports%s,\nÏ?Î± Î¿Ï?Î¿Î¯Î± Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± ÎºÏ?Ï?Ï?Î¿Ï?Î½ Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Ï?Î±Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor, ÎºÎ¬Î½Î¿Î½Ï?Î±Ï? Ï?Î¿\nÎ´Ï?Ï?ÎºÎ¿Î»Ï?Ï?ÎµÏ?Î¿ Î³Î¹Î± ÎºÎ¬Ï?Î¿Î¹Î¿Î½ Ï?Î¿Ï? Ï?Î±Ï?Î±ÎºÎ¿Î»Î¿Ï?Î¸ÎµÎ¯ Ï?Î· ÎºÎ¯Î½Î·Ï?Î· Ï?Î±Ï? Î½Î± ÎºÎ±Ï?Î±Î»Î¬Î²ÎµÎ¹ Ï?Ï?Ï?\nÏ?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Î¥Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? IPv6 addresses, Î±Î»Î»Î¬ ÎºÎ¬Ï?Î¿Î¹Î± Pluggable\nTransports Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï?Ï?Î¼Î²Î±Ï?Î¬ Î¼Îµ IPv6.\n\n"
+msgstr "Î¥Ï?Î¬Ï?Ï?Î¿Ï?Î½ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Îµ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? IPv6, Î±Î»Î»Î¬ ÎºÎ¬Ï?Î¿Î¹Î± Pluggable\nTransports Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï?Ï?Î¼Î²Î±Ï?Î¬ Î¼Îµ IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +262,20 @@ msgid ""
 "\n"
 msgstr "Î?Ï?Î¯Ï?Î·Ï?, Î· BridgeDB ÎÏ?ÎµÎ¹ Ï?Î¿Î»Î»ÎÏ? Ï?Î±Î»Î¹ÎÏ? ÎºÎ±Î»ÎÏ? Î³ÎÏ?Ï?Ï?ÎµÏ? %s Ï?Ï?Ï?Î¯Ï?\nPluggable Transports %s Ï?Î¿Ï? Î¯Ï?Ï?Ï? Î´ÎµÎ½ Î±ÎºÎ¿Ï?Î³ÎµÏ?Î±Î¹ ÎºÎ±Ï?Î±Ï?Î»Î·ÎºÏ?Î¹ÎºÏ?, Î±Î»Î»Î¬ Ï?Îµ Ï?Î¿Î»Î»ÎÏ? Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÎ¹Ï? Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï? Î²Î¿Î·Î¸Î®Ï?Î¿Ï?Î½ Î½Î± Ï?Î±Ï?Î±ÎºÎ¬Î¼Ï?ÎµÏ?Îµ Ï?Î· Î»Î¿Î³Î¿ÎºÏ?Î¹Ï?Î¯Î±.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Î¤Î¹ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ?;"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "Î?Î¹ %s Î?ÎÏ?Ï?Ï?ÎµÏ? %s ÎµÎ¯Î½Î±Î¹ Tor Î±Î½Î±Î¼ÎµÏ?Î±Î´Ï?Ï?ÎµÏ? Ï?Î¿Ï? Î²Î¿Î·Î¸Î¿Ï?Î½ Ï?Ï?Î·Î½ Ï?Î±Ï?Î¬ÎºÎ±Î¼Ï?Î· Ï?Î·Ï? Î»Î¿Î³Î¿ÎºÏ?Î¹Ï?Î¯Î±Ï?. "
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ ÎÎ½Î±Î½ ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÏ? Ï?Ï?Ï?Ï?Î¿ Î³Î¹Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î·Ï?Î· Î³ÎÏ?Ï?Ï?Ï?Î½! "
+msgstr "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ ÎÎ½Î±Î½ ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÏ? Ï?Ï?Ï?Ï?Î¿ Î³Î¹Î± Î»Î®Ï?Î· Î³ÎµÏ?Ï?Ï?Ï?Î½! "
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +283,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬ Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î»Î¬Î²ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?ÎµÎ»Î½Î¿Î½Ï?Î±Ï? email Ï?Ï?Î¿ %s. Î Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?ÎµÎ¯Î»ÎµÏ?Îµ email Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? Î¼Î¯Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· email Î±Ï?Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î¬Ï?Î¿Ï?Î¿Ï?Ï?:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Î?Î¹ Î³ÎÏ?Ï?Ï?ÎµÏ? Î¼Î¿Ï? Î´ÎµÎ½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¿Ï?Î½! Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ Î²Î¿Î®Î¸ÎµÎ¹Î±! "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Î?Î½ Ï?Î¿ Tor Ï?Î±Ï? Î´Îµ Î´Î¿Ï?Î»ÎµÏ?ÎµÎ¹, Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ %s."
@@ -164,201 +296,100 @@ msgstr "Î?Î½ Ï?Î¿ Tor Ï?Î±Ï? Î´Îµ Î´Î¿Ï?Î»ÎµÏ?ÎµÎ¹, Ï?Î±Ï?Î±ÎºÎ±Î»Ï? Ï?Ï?ÎµÎ¯Î»
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? Î´Ï?Ï?Ï?Îµ Î¼Î±Ï? Ï?Ï?Î¿ Ï?Î¿ Î´Ï?Î½Î±Ï?Ï?Î½ Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Ï?Î»Î·Ï?Î¿Ï?Î¿Ï?Î¯ÎµÏ? Î³Î¹Î± Ï?Î¿ Ï?Ï?Î¬Î»Î¼Î± Ï?Î¿Ï? Ï?Ï?Î½Î±Î½Ï?Î®Ï?Î±Ï?Îµ, Ï?Ï?Ï?Ï? Ï?Î· Î»Î¯Ï?Ï?Î± Î³ÎµÏ?Ï?Ï?Ï?Î½ ÎºÎ±Î¹ Ï?Î± Pluggable Transports Ï?Î¿Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?ÎµÏ?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ, Ï?Î·Î½ ÎÎºÎ´Î¿Ï?Î· Ï?Î¿Ï? Tor Browser, Ï?,Ï?Î¹ Î¼Î·Î½Ï?Î¼Î±Ï?Î± ÎÎ´ÎµÎ¹Î¾Îµ Ï?Î¿ Tor ÎºÏ?Î»."
+msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? Î´Ï?Ï?Ï?Îµ Î¼Î±Ï? Ï?Ï?Î¿ Ï?Î¿ Î´Ï?Î½Î±Ï?Ï?Î½ Ï?ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? Ï?Î»Î·Ï?Î¿Ï?Î¿Ï?Î¯ÎµÏ? Î³Î¹Î± Ï?Î¿ \nÏ?Ï?Î¬Î»Î¼Î± Ï?Î¿Ï? Ï?Ï?Î½Î±Î½Ï?Î®Ï?Î±Ï?Îµ, Ï?Ï?Ï?Ï? Ï?Î· Î»Î¯Ï?Ï?Î± Î³ÎµÏ?Ï?Ï?Ï?Î½ ÎºÎ±Î¹ Ï?Î± Pluggable Transports \nÏ?Î¿Ï? Ï?Ï?Î¿Ï?Ï?Î±Î¸Î®Ï?Î±Ï?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ, Ï?Î·Î½ ÎÎºÎ´Î¿Ï?Î· Ï?Î¿Ï? Tor Browser, \nÏ?,Ï?Î¹ Î¼Î·Î½Ï?Î¼Î±Ï?Î± ÎÎ´ÎµÎ¹Î¾Îµ Ï?Î¿ Tor, ÎºÏ?Î»."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Î?Î´Î¿Ï? Î¿Î¹ Î³Ï?Î±Î¼Î¼ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
+msgstr "Î?Ï?Î¯Ï?Ï?Îµ, Î¿Î¹ Î³Ï?Î±Î¼Î¼ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎÏ? Ï?Î±Ï?:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Î?Î®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Î Î±Ï?Î±ÎºÎ±Î»Ï? ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¹Ï? ÎµÏ?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Î¿Î½ Ï?Ï?Ï?Î¿ Ï?Î·Ï? Î³ÎÏ?Ï?Ï?Î±Ï?:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Î§Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Î±Î¹ Î¼Î¹Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· IPv6;"
+msgstr "Î§Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ Î¼Î¹Î± Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· IPv6;"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Î?Î®Ï?Ï?Ï? Ï?Ï?ÎµÎ¹Î¬Î¶ÎµÏ?Ï?Îµ ÎÎ½Î± %s;"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Î? Ï?Ï?Î»Î»Î¿Î¼ÎµÏ?Ï?Î·Ï?Î®Ï? Ï?Î±Ï? Î´ÎµÎ½ ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Ï?Î¹Ï? ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Ï?Î¬."
+msgstr "Î? browser Ï?Î±Ï? Î´ÎµÎ½ ÎµÎ¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Ï?Î¹Ï? ÎµÎ¹ÎºÏ?Î½ÎµÏ? Ï?Ï?Ï?Ï?Î¬."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÏ?Î®Ï?ÎµÏ? Î±Ï?Ï? Ï?Î·Î½ Ï?Î±Ï?Î±Ï?Î¬Î½Ï? Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î¯Î±..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Î Ï?Ï? Î½Î± Î±Ï?Ï?Î¯Ï?ÎµÏ?Îµ Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Î±Ï?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "Î?Î¹Î± Î½Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿ Tor Browser, Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¹Ï? Î¿Î´Î·Î³Î¯ÎµÏ? Ï?Ï?Î· %s Ï?ÎµÎ»Î¯Î´Î± download Ï?Î¿Ï? Tor Browser %s Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®Ï?ÎµÏ?Îµ Ï?Î¿ Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Î?Î¹Î± Î½Î± ÎµÎ¹Ï?Î¬Î³ÎµÏ?Îµ bridges Ï?Ï?Î¿ Tor Browser, Î±Ï?Ï?Î¹ÎºÎ¬ ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ %s Tor Browser Ï?ÎµÎ»Î¯Î´Î±\nÎºÎ±Ï?ÎµÎ²Î¬Ï?Î¼Î±Ï?Î¿Ï?%s ÎÏ?ÎµÎ¹Ï?Î± Î±ÎºÎ¿Î»Î¿Ï?Î¸Î®Ï?Ï?Îµ Ï?Î¹Ï? Î¿Î´Î·Î³Î¯ÎµÏ? Î³Î¹Î± ÎºÎ±Ï?ÎÎ²Î±Ï?Î¼Î± ÎºÎ±Î¹ ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? \nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Î?Î½Ï?Ï?Î¯Î¶ÎµÏ?Îµ Î±Î½ Î¿ Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ ÎµÎ»ÎÎ³Ï?ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?\nÏ?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?"
+msgstr "Î? Ï?Î¬Ï?Î¿Ï?Î¿Ï? (ISP) Ï?Î±Ï? Î¼Ï?Î»Î¿ÎºÎ¬Ï?ÎµÎ¹ Î® Î¼Îµ Î¿Ï?Î¿Î¹Î¿Î´Î®Ï?Î¿Ï?Îµ Ï?Ï?Ï?Ï?Î¿ Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÎ¹ Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï?\nÏ?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ \"Î?Î±Î¹\" ÎºÎ±Î¹ Î¼ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î?Ï?Ï?Î¼ÎµÎ½Î¿\" Î?Î¹Î± Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î¹Ï? Î½ÎÎµÏ? Ï?Î±Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?, Î±Î½Ï?Î¹Î³Ï?Î¬Ï?Ï?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î¼Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Ï?Î½ Î³ÎµÏ?Ï?Ï?Ï?Î½ Ï?Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï?. Î?ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î£Ï?Î½Î´ÎµÏ?Î·\" ÎºÎ±Î¹ Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ¯Ï?Ï?Îµ ÎµÎ½Ï?Î¬Î¾ÎµÎ¹! Î?Î½ Î±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Ï?ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î±, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ \"Î?Î¿Î®Î¸ÎµÎ¹Î±\" Ï?Ï?Î¹Ï? \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\"."
+msgstr "Î?Ï?Î¹Î»ÎÎ¾Ï?Îµ \"Î?Î±Î¹\" ÎºÎ±Î¹ Î¼ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î?Ï?Ï?Î¼ÎµÎ½Î¿\". Î?Î¹Î± Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î± Î½ÎÎ± Ï?Î±Ï? \nbridges, Î±Î½Ï?Î¹Î³Ï?Î¬Ï?Ï?Îµ Ï?Î¹Ï? Î³Ï?Î±Î¼Î¼ÎÏ? Î¼Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? Ï?Ï?Î½ bridges Ï?Ï?Î¿ ÎºÎ¿Ï?Ï?Î¯ \nÎºÎµÎ¹Î¼ÎÎ½Î¿Ï?. Î?ÎµÏ?Î¬ Ï?Î±Ï?Î®Ï?Ï?Îµ \"Î£Ï?Î½Î´ÎµÏ?Î·\" ÎºÎ±Î¹ Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± ÎµÎ¯Ï?Ï?Îµ ÎµÎ½Ï?Î¬Î¾ÎµÎ¹! Î?Î½ \nÎ±Î½Ï?Î¹Î¼ÎµÏ?Ï?Ï?Î¯Ï?ÎµÏ?Îµ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î±, ÎµÏ?Î¹Î»ÎÎ¾Ï?Îµ Ï?Î¿ ÎºÎ¿Ï?Î¼Ï?Î¯ \"Î?Î¿Î®Î¸ÎµÎ¹Î±\" Ï?Ï?Î¹Ï? \"Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? \nÎ´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î¿Ï? Tor\"."
 
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Î?Î¼Ï?Î±Î½Î¯Î¶ÎµÎ¹ Î±Ï?Ï?Ï? Ï?Î¿ Î¼Î®Î½Ï?Î¼Î±."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Î?Î¯Ï?Î·Ï?Î· Î³ÎµÏ?Ï?Ï?Ï?Î½ Î²Î±Î½Î¯Î»Î¹Î±."
+msgstr "Î?Î¯Ï?Î·Ï?Î· Ï?Î±Î»Î¹Ï?Î½ ÎºÎ±Î»Ï?Î½ bridges."
 
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Î?Î¯Ï?Î·Ï?Î· IPv6 Î³ÎµÏ?Ï?Ï?Ï?Î½."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Î?Î·Ï?Î®Ï?Ï?Îµ ÎÎ½Î± Pluggable Transport Î²Î¬Ï?ÎµÎ¹ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Î?Î¬Î²ÎµÏ?Îµ ÎÎ½Î± Î±Î½Ï?Î¯Î³Ï?Î±Ï?Î¿ Ï?Î¿Ï? Î´Î·Î¼Î¿Ï?Î¯Î¿Ï? GnuPG ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï? Ï?Î¿Ï? BridgeDB."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Î?Ï?Î±Ï?Î®"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
-msgid "Uh oh, spaghettios!"
-msgstr "Î?Ï?Ï?Ï?, ÎºÎ¬Ï?Î¹ Ï?Î®Î³Îµ Ï?Ï?Ï?Î±Î²Î¬!"
-
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ ÎºÎ±Î¸Ï?Î»Î¿Ï? Î´Î¹Î±Î¸ÎÏ?Î¹Î¼ÎµÏ? Î³ÎÏ?Ï?Ï?ÎµÏ?..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Î?Î¿ÎºÎ¹Î¼Î¬Ï?Ï?Îµ Î½Î± %s Ï?Î¬Ï?Îµ Ï?Î¯Ï?Ï? %s ÎºÎ±Î¹ Î½Î± ÎµÏ?Î¹Î»ÎÎ¾ÎµÏ?Îµ Î´Î¹Î±Ï?Î¿Ï?ÎµÏ?Î¹ÎºÏ? Ï?Ï?Ï?Î¿ Î³ÎÏ?Ï?Ï?Î±Ï?!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Î?Î®Î¼Î± %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Î?Î®Î¼Î± %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Î Î±Ï?Ï?Îµ Ï?Î¹Ï? %s Î³ÎµÏ?Ï?Ï?ÎµÏ? %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Î?Î®Î¼Î± %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Î¤Ï?Ï?Î± %s Ï?Ï?Î¿Ï?Î¸ÎÏ?Ï?Îµ Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ? Ï?Ï?Î¿ Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÎ?%sÏ?Î»Ï?Ï? Î´Ï?Ï?Îµ Î¼Î¿Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Î?Ï?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Ï?Î¿Ï?Ï?Ï?Î·Î¼ÎÎ½Î¿Ï?Ï?"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Î?Ï?Î¹"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÎ?%sÎ±Î¹!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÎ?%sÎ®Ï?Î· Î?ÎµÏ?Ï?Ï?Ï?Î½"
diff --git a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
index 67d2555..8bb8bff 100644
--- a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,23 +1,23 @@
 # Translations template for BridgeDB.
 # Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
-#
+# 
 # Translators:
 # Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015
 # Richard Shaylor <rshaylor@xxxxxx>, 2014
 # ronnietse <tseronnie@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-07 13:19+0000\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2017-09-19 23:30+0000\n"
 "Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -32,57 +32,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Report a Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Source Code"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Select All"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Show QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode for your bridge lines"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Uh oh, spaghettios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "It seems there was an error getting your QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "There are no bridges available currently..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Step %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Step %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Get %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Step %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Now %s add the bridges to Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust give me bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "none"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[This is an automated message; please do not reply.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Here are your bridges:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Welcome to BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Currently supported transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hey, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Public Keys"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s o
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +229,7 @@ msgid ""
 msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -116,7 +241,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +250,20 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "I need an alternative way of getting bridges!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +271,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "If your Tor doesn't work, you should email %s."
@@ -159,48 +284,48 @@ msgstr "If your Tor doesn't work, you should email %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +334,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -231,153 +356,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Displays this message."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Report a Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Source Code"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Select All"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Show QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode for your bridge lines"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "It seems there was an error getting your QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "There are no bridges available currently..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Step %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Step %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Get %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Step %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Now %s add the bridges to Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust give me bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Advanced Options"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
diff --git a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
index 9b41809..d0883fb 100644
--- a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
@@ -5,27 +5,33 @@
 # Translators:
 # dark_yoshi <angelargi@xxxxxxxx>, 2014
 # toypurina <biolenta@xxxxxxxxxx>, 2014
+# B. K., 2016
 # BL <tresemes3@xxxxxxxxx>, 2014
-# Edward Navarro <enavarro@xxxxxxxxxxx>, 2015
-# Ignacio RodrÃguez <ignacio@xxxxxxxxxxxxx>, 2015
+# Edward Navarro, 2015
+# Emma Peel, 2017-2019
+# eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2016
+# Ignacio RodrÃguez <inactive+i5o@xxxxxxxxxxxxx>, 2015
 # NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011
 # Noel Torres <envite@xxxxxxxxxxxxx>, 2013
 # Paola Falcon <cacoepy@xxxxxxxxx>, 2014
+# ROSA CRUELLS <thelmacat65@xxxxxxxxxxx>, 2015
 # Jonis <srvial@xxxxxxxxxxx>, 2014
-# strel, 2013-2015
+# strel, 2013-2016
 # strel, 2012
+# Werwolf NS <inactive+WerwolfNS@xxxxxxxxxxxxx>, 2017
+# 322ccc6cfb939d448f1137bdc72c015b, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 07:21+0000\n"
-"Last-Translator: Ignacio RodrÃguez <ignacio@xxxxxxxxxxxxx>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-03-10 11:12+0000\n"
+"Last-Translator: Emma Peel\n"
+"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -40,68 +46,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Â¡Lo sentimos! Algo mal pasÃ³ con tu solicitud."
+msgstr "Â¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Informar sobre un error"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "CÃ³digo fuente"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registro de cambios"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleccionar todos"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar cÃ³digo QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "CÃ³digo QR para tus lÃneas de puentes"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh oh, Â¡la liamos!  "
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que hubo un error al obtener tu cÃ³digo QR. "
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©alo con un lector de cÃ³digos QR para copiar tus lÃneas de puente a dispositivos mÃ³viles y otros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ahora mismo no hay ningÃºn puente disponible..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Â¡Tal vez deberÃas probar a %s retroceder %s y seleccionar un tipo distinto de puente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Paso %s1%s "
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarga %s el Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Paso %s2%s "
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Consigue %s puentes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Paso %s3%s "
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ahora %s aÃ±ade los puentes al Tor Browser  %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "Â¡Dame %sS%sÃ³lo puentes! "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ninguno"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "Â¡%sS%sÃ!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sC%sonseguir Puentes"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automÃ¡tico; por favor no responda.]"
+msgstr "[Este es un mensaje automÃ¡tico; por favor no respondas.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "AquÃ estÃ¡n sus bridges:"
+msgstr "AquÃ tienes tus puentes:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Ha excedido el lÃmite de velocidad. Por favor, Â¡mÃ¡s despacio! El tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Los siguientes correos durante este periodo de tiempo serÃ¡n ignorados. "
+msgstr "Has excedido el lÃmite de cuota. Por favor, Â¡mÃ¡s despacio! El tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Durante este periodo se ignorarÃ¡n los correos. "
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combine COMMANDs (comandos) para especificar mÃºltiples opciones simultÃ¡neamente)"
+msgstr "COMMANDs: (combina COMMANDs para especificar de manera simultÃ¡nea opciones mÃºltiples)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Â¡Bienvenido a BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs actualmente soportados:"
+msgstr "TIPOs de transporte soportados actualmente:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Â¡Eh, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Este correo fue generado con arcoiris, unicornios y chispitas para %s el %s a las %s."
+msgstr "Este correo fue generado con arcoiris, unicornios y estrellitas para %s el %s a las %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,283 +240,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB puede proveer bridges con varios %stipos de Pluggable Transports%s  que pueden ayudar a ofuscar sus conexiones a la red Tor, haciendo que sea mÃ¡s difÃcil para alguien que estÃ© viendo su trÃ¡fico en la red el determinar que ud. estÃ¡ usando Tor.\n"
+msgstr "BridgeDB puede proporcionar puentes con diferentes %stipos de Pluggable Transports%s que pueden ayudar a ofuscar tus conexiones a la red Tor, dificultando determinar que estÃ¡s usando Tor para alguien que estÃ© observando tu trÃ¡fico de Internet.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "TambiÃ©n hay disponibles varios bridges con direcciones IPv6, aunque algunos\nPluggable Trasnports no son compatibles con IPv6.\n\n"
+msgstr "TambiÃ©n hay disponibles varios puentes con direcciones IPv6, aunque algunos Transportes conectables no son compatibles con IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "AdemÃ¡s, BridgeDB tiene un montÃ³n de sencillos-clÃ¡sicos-estÃ¡ndar (vanilla) bridges\n%s sin ningÃºn Pluggable Transport %s, lo que tal vez no suena tan molÃ³n, pero que\naÃºn pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
+msgstr "AdemÃ¡s, BridgeDB tiene un montÃ³n de puentes estÃ¡ndar %s sin ningÃºn Pluggable Transport %s , lo que tal vez no suena tan molÃ³n, pero que todavÃa pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Â¿QuÃ© son los puentes ('bridges')?"
+msgstr "Â¿QuÃ© son los puentes?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "Los %s bridges %s son un tipo de repetidores Tor que le ayudan a eludir la censura."
+msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Â¡Necesito un modo alternativo de conseguir puentes!"
+msgstr "Â¡Necesito un modo alternativo de obtenciÃ³n de puentes de red!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Otra forma de obtener repetidores puente (bridges) es enviar un correo electrÃ³nico a %s. Por favor observe que tiene que enviar el correo usando la direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico:\n%s, %s or %s."
+msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una direcciÃ³n de uno de los siguientes proveedores de correo electrÃ³nico:\n%s, %s o %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Â¡Mis bridges/puentes no funcionan! Â¡Necesito ayuda!"
+msgstr "Â¡Mis puentes funcionan! Â¡Necesito ayuda!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si su Tor no funciona, debe enviar un correo a %s"
+msgstr "Si Tor no funciona, debes enviar un correo a %s"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Intenta incluir tanta informaciÃ³n como puedas de tu caso, incluyendo la lista de\nbridges (repetidores puente) y Pluggable Transports (transportes conectables) que\nintentaste usar, tu versiÃ³n de Navegador Tor y cualquier mensaje que haya dado Tor, etc."
+msgstr "Intenta incluir tanta informaciÃ³n como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versiÃ³n de Tor Browser y cualquier mensaje que Tor haya dado, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "AquÃ estÃ¡n tus lÃneas de bridge:"
+msgstr "Estas son tus lÃneas de puente de red:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Â¡Obtener bridges!"
+msgstr "Â¡Obtener puentes!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "Por favor, selecciona opciones para el tipo de bridge:"
+msgstr "Por favor, selecciona opciones para el tipo de puente:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Â¿Necesitas direcciones IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Â¿Necesitas un %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Tu navegador no estÃ¡ mostrando las imÃ¡genes correctamente."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Introduce los caracteres de la imagen de arriba..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "CÃ³mo comenzar a usar tus bridges"
+msgstr "CÃ³mo comenzar a usar los puentes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Para introducir bridges (repetidores puente) en el Navegador Tor, primero vaya\na la %s pÃ¡gina de descarga del Navegador Tor %s y luego siga las instrucciones\nallÃ para descargar e iniciar el Navegador Tor."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Cuando el cuadro de 'Configuraciones de red Tor' aparezca, haz clic en 'Configurar'\ny sigue el asistente hasta que pregunte:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Â¿Su proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
+msgstr "Â¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecciona 'SÃ' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\nbridges, copia y pega las lÃneas de bridges en el cuadro de texto.\nPor Ãºltimo, haz clic en 'Conectar', Â¡y listo!\nSi encuentras problemas, prueba dando clic en el botÃ³n 'Ayuda'\nen el asistente de 'Configuraciones de red Tor' para asistencia adicional."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Muestra este mensaje."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Solicitar bridges estÃ¡ndar (vanilla)."
+msgstr "Solicitar puentes estÃ¡ndar."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Solicitar bridges IPv6."
+msgstr "Solicitar puente de red IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Pluggable Transport por TYPE."
+msgstr "Solicitar un Pluggable Transport por TYPE ."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Reportar una falla"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "CÃ³digo fuente"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registro de cambios"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contactar"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seleccionar todos"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar cÃ³digo QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "CÃ³digo QR para sus lÃneas de repetidores puente"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oh oh, Â¡la liamos!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que hubo un error al obtener su cÃ³digo QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene sus lÃneas de repetidores puente (bridges). EscanÃ©elo con un lector de cÃ³digos QR para copiar sus lÃneas de puentes a dispositivos mÃ³viles/celulares y otros dispositivos."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ahora mismo no hay ningÃºn bridge disponible..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Â¡Tal vez debas probar %s volviendo atrÃ¡s %s y seleccionando un tipo diferente de bridge!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Paso %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarga %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Paso %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenga los %s puentes ('bridges') %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Paso %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s aÃ±ada los bridges al Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "Â¡%sS%sÃ³lo dame los bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtener bridges"
diff --git a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
index 0b9b793..692a7f9 100644
--- a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
@@ -4,27 +4,31 @@
 # 
 # Translators:
 # arashaalaei <aalaeiarash@xxxxxxxxx>, 2011
-# signal89 <ali.faraji90@xxxxxxxxx>, 2014
+# signal89, 2014
+# Amir Moezzi <amirreza.mz@xxxxxxxxx>, 2017
 # ardeshir, 2013
-# Gilberto, 2014-2015
+# Ehsan Ab <a.ehsan70@xxxxxxxxx>, 2015
+# NoProfile, 2014-2015
 # johnholzer <johnholtzer123@xxxxxxxxx>, 2014
+# Mehrad Rousta <mehrad77@xxxxxxxxx>, 2018
 # Mohammad Hossein <desmati@xxxxxxxxx>, 2014
 # perspolis <rezarms@xxxxxxxxx>, 2011
+# masoudd <relive.mn@xxxxxxxxx>, 2018
 # Setareh <setareh.salehee@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-21 08:26+0000\n"
-"Last-Translator: Gilberto\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-12 17:54+0000\n"
+"Last-Translator: Reza Ghasemi\n"
+"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -37,68 +41,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Ù?ØªØ§Ø³Ù? Ù?Ø³ØªÛ?Ù?Ø? Ø¯Ø± Ø±Ø§Ø¨Ø·Ù? Ø¨Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø®Ø·Ø§Û?Û? Ø±Ø® Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
+msgstr "Ù?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø¯Ø± Ø±Ø§Ø¨Ø·Ù? Ø¨Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø®Ø·Ø§Û?Û? Ø±Ø® Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ØªÙ?Ø§Ø³"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ú¯Ø²Û?Ù?Ø´ Ù?Ù?Ù?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ù?Ù?Ø§Û?Ø´ QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode Ø¨Ø±Ø§Û? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ø¢Ø® Ø¢Ø®Ø? Ø§Ø´ØªØ¨Ø§Ù? Ø´Ø¯!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Û?Ú© Ø®Ø·Ø§ Ø¯Ø± Ú¯Ø±Ù?ØªÙ? QRCode Ø´Ù?Ø§ Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø±Ø¯."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ø§Û?Ù? QRCode Ø´Ø§Ù?Ù? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯. Ø§Ø³Ú©Ù? Ø¢Ù? Ø±Ø§ Ø¨Ø§ Û?Ú© Ø®Ù?Ø§Ù?Ù?Ø¯Ù? QRCode Ø¨Ø±Ø§Û? Ú©Ù¾Û? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯ Ø¨Ø± Ø±Ù?Û? ØªÙ?Ù?Ù? Ù?Ù?Ø±Ø§Ù? Ù? Ø¯Ø³ØªÚ¯Ø§Ù? Ù?Ø§Û? Ø¯Û?Ú¯Ø±."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ù?Ù?â??Ø§Ú©Ù?Ù?Ù? Ù?Û?Ú? Ù¾Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?Û?Ø³Øª..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Ø´Ø§Û?Ø¯ Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø³Ø¹Û? Ú©Ù?Û?Ø¯ %s Ø¨Ø§Ø²Ú¯Ø´Øª %s Ù? Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ø¹ Ù¾Ù? Ù?Ø§Û? Ù?Ø®ØªÙ?Ù?!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ù?Ø±ØÙ?Ù? %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ù?Ø±ØÙ?Ù? %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ø¯Ø±Û?Ø§Ù?Øª %s Ù¾Ù?â?? Ù?Ø§  %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ù?Ø±ØÙ?Ù? %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ØØ§Ù?Ø§ %s Ø§Ø¶Ø§Ù?Ù? Ú©Ø±Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÙ?%sÙ?Ø· Ø¨Ø¯Ù? Ø¨Ù? Ù?Ù? Ù¾Ù? Ù?Ø§ Ø±Ø§!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ú¯Ø²Û?Ù?Ù?â??Ù?Ø§Û? Ù¾Û?Ø´Ø±Ù?ØªÙ?"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ù?Ù?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ù?Û?Ú?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sØ¨%sÙ?Ù?!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sØ¯%sØ±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ø§Û?Ù? Û?Ú© Ù¾Û?Ø§Ù? Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Û? Ø¨Ø§Ø´Ø¯Ø? Ù?Ø·Ù?Ø§ Ù¾Ø§Ø³Ø® Ù?Ø¯Ù?Û?Ø¯.]"
+msgstr "[Ø§Û?Ù? Û?Ú© Ù¾Û?Ø§Ù? Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Û?â??Ø¨Ø§Ø´Ø¯Ø? Ù?Ø·Ù?Ø§ Ù¾Ø§Ø³Ø® Ù?Ø¯Ù?Û?Ø¯.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ù?Ù?Ø±Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø´Ù?Ø§:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ø´Ù?Ø§ Ø§Ø² ØØ¯ Ù?Ø¬Ø§Ø² ØªØ¬Ø§Ù?Ø² Ù?Ù?Ù?Ø¯Ù? Ø§Û?Ø¯. Ù?Ø·Ù?Ø§Ù? Ø§Ù?Ø¯Ú©Û? Ú©Ù?Ø¯ ØªØ± Ø§Û?Ù?Û?Ù? Ø¨Ù?Ø±Ø³ØªÛ?Ø¯. ØØ¯Ø§Ù?Ù? Ø²Ù?Ø§Ù? Ù?Ù?Ú©Ù? Ù?Ø§Ø¨Û?Ù?\nØ§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ù?Ø§ %s Ø³Ø§Ø¹Øª Ø§Ø³Øª. ØªÙ?Ø§Ù?Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø¨Ø¹Ø¯Û? Ø¯Ø± Ø§Û?Ù? Ù?Ø¯Øª Ø²Ù?Ø§Ù?Û? Ø§Ø±Ø³Ø§Ù? Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ Ø´Ø¯."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "Ø¯Ø³ØªÙ?Ø±Ø§Øª: (ØªØ±Ú©Û?Ø¨ Ø¯Ø³ØªÙ?Ø±Ø§Øª Ø¨Ø±Ø§Û? Ù?Ø´Ø®Øµ Ú©Ø±Ø¯Ù? Ú¯Ø²Û?Ù?Ù? Ù?Ø§Û? Ù?ØªØ¹Ø¯Ø¯ Ø¨Ù? Ø·Ù?Ø± Ù?Ù?Ø²Ù?Ø§Ù?)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr "Ø¨Ù? BridgeDB Ø®Ù?Ø´ Ø¢Ù?Ø¯Û?Ø¯!"
+msgstr "Ø¨Ù? BridgeDB Ø®Ù?Ø´â??Ø¢Ù?Ø¯Û?Ø¯!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ø§Ù?Ù?Ø§Ø¹ Ù?Ù?Ú©Ù? Ø§Ø² TYPE Ù?Ø§Û? Ø§Ù?ØªÙ?Ø§Ù?:"
+msgstr "Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ù?Ø¯Ù? Ù?Ø§Û? ØÙ?Ù? Ù? Ù?Ù?Ù? Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ø´Ø¯Ù? Ù?Ø³ØªÙ?Ø¯ : "
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ø³Ù?Ø§Ù?Ø?  %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³Øª Ù?Ù?!"
+msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³ØªÙ?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr "Public Key Ù?Ø§"
+msgstr "Ú©Ù?Û?Ø¯Ù?Ø§Û? Ø¹Ù?Ù?Ù?Û?"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ø¨Ø§ Ø±Ù?Ú¯Û?Ù? Ú©Ù?Ø§Ù? Ù?Ø§Ø? Ø§Ø³Ø¨ Ù?Ø§Û? ØªÚ©Ø´Ø§Ø® Ù? Ø²Ø±Ù? Ù? Ø¨Ø±Ù? Ø¨Ø±Ø§Û?  %s Ø¨Ø±  %s Ù? Ø¯Ø±  %s ØªÙ?Ù?Û?Ø¯ Ø´Ø¯Ù? Ø§Ø³Øª."
+msgstr "Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ø¨Ø§ Ø±Ù?Ú¯Û?Ù?â??Ú©Ù?Ø§Ù?â??Ù?Ø§Ø? Ø§Ø³Ø¨â??Ù?Ø§Û? ØªÚ©Ø´Ø§Ø® Ù? Ø²Ø±Ù? Ù? Ø¨Ø±Ù? Ø¨Ø±Ø§Û?  %s Ø¨Ø±  %s Ù? Ø¯Ø±  %s ØªÙ?Ù?Û?Ø¯ Ø´Ø¯Ù? Ø§Ø³Øª."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,7 +238,7 @@ msgid ""
 msgstr "BridgeDB Ù?Û? ØªÙ?Ø§Ù?Ø¯ Ù¾Ù? Ù?Ø§ Ø¨Ø§ %sØ§Ù?Ù?Ø§Ø¹ Ù?ØªØ¹Ø¯Ø¯Û? Ø§Ø² Pluggable Transports%s Ù?Ø±Ø§Ù?Ù? Ú©Ù?Ø¯ Ú©Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?Ø¯ Ø§ØªØµØ§Ù? Ø´Ù?Ø§ Ø¨Ù? Tor Network ØªØ§ ØØ¯ Ø§Ù?Ú©Ø§Ù? Ù?Ø¨Ù?Ù? Ù? Ù?Ø§Ø´Ù?Ø§Ø³ Ø¨Ø§Ù?Û? Ø¨Ù?Ø§Ù?Ø¯ Ù? Ù?Û?Ú? Ú©Ø³ Ø¯Û?Ú¯Ø±Û? Ù?ØªÙ?Ø§Ù?Ø¯ Ø¨Ù? Ø±Ø§ØØªÛ? Ø¨Ù? Ø§ØªØµØ§Ù? Ø´Ù?Ø§ Ø¨Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ù?Ø¸Ø§Ø±Øª Ú©Ù?Ø¯ Ù? ØªØ´Ø®Û?Øµ Ø¨Ø¯Ù?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø§Ø² Tor Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û? Ú©Ù?Û?Ø¯.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -121,7 +250,7 @@ msgstr "Ø¨Ø¹Ø¶Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§ Ø¨Ø§ Ø¢Ø¯Ø±Ø³â??Ù?Ø§Û? IPv6 Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +259,20 @@ msgid ""
 "\n"
 msgstr "Ù?Ù?Ú?Ù?Û?Ù? BridgeDB Ø´Ø§Ù?Ù? ØªØ¹Ø¯Ø§Ø¯ Ø²Û?Ø§Ø¯Û? Ù¾Ù? Ù?Ø§Û? Ø§Ø¨ØªØ¯Ø§Û?Û? Ù? Ù?Ø¯Û?Ù?Û? Ø§Ø³Øª Ú©Ù? %s Pluggable Transports Ù?Ø¯Ø§Ø±Ù?Ø¯ %s Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Û? Ù?ØµØ±Ù? Ø¨Ù? Ù?Ø¸Ø± Ø¨Ø±Ø³Ù?Ø¯ Ø§Ù?Ø§ Ù?Ù?Ú?Ù?Ø§Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¯Ø± Ù?Ù?Ø§Ø±Ø¯ Ù?ØªØ¹Ø¯Ø¯Û? Ø¬Ù?Øª Ø¯Ù?Ø± Ø²Ø¯Ù? Ù?Û?Ù?ØªØ±Û?Ù?Ú¯ Ø¨Ù? Ø´Ù?Ø§ Ú©Ù?Ú© Ú©Ù?Ù?Ø¯.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ù¾Ù? Ù?Ø§ Ú?Ù? Ù?Ø³ØªÙ?Ø¯Ø?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ù¾Ù? Ù?Ø§ %s Ù?Ø³ØªÙ?Ø¯ Ø¨Ø§Ø²Ù¾Ø®Ø´ Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? ØªÙ?Ø± Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¨Ù? Ø´Ù?Ø§ Ø¨Ø±Ø§Û? Ø¯Ù?Ø± Ø²Ø¯Ù? Ø³Ø§Ù?Ø³Ù?Ø±Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?Ø¯ ."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ø¨Ù? Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª bridge Ù?Ø§ Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +280,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Û?Ú© Ø·Ø±Û?Ù? Ø¯Û?Ú¯Ø±Û? Ú©Ù? Ù?Û?ØªÙ?Ø§Ù?Û?Ø¯ Ù¾Ù?Ù?Ø§ Ø±Ø§ Ø¨Ú¯Û?Ø±Û?Ø¯, Ø§Ø² Ø·Ø±Û?Ù? Ù?Ø²Ø³ØªØ§Ø¯Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? %s  Ù?Û?Ø¨Ø§Ø´Ø¯. Ù?Ø·Ù?Ø§ Ø¯Ù?Øª Ù?Ø± Ù?Ø§Û?Û?Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯ Ø±Ø§ ØØªÙ?Ø§ Ø§Ø² Û?Ú©Û? Ø§Ø² Ù?Ø±Ø§Ù?Ù?Ú©Ù?Ù?Ø¯ Ú¯Ø§Ù? Ø§Û?Ù?Û?Ù?Û? Ø²Û?Ø± Ø¨Ù?Ø±Ø³ØªÛ?Ø°:    %s   %s  Ù? Û?Ø§  %s  ."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Ø¨Ù? Ú©Ù?Ú© Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?! Ù¾Ù? Ù?Ø§Û? Ù?Ù? Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ù?Ø¯!"
+msgstr "Ø¨Ù? Ú©Ù?Ú© Ø§ØØªÛ?Ø§Ø¬ Ø¯Ø§Ø±Ù?! Ù¾Ù?â??Ù?Ø§Û? Ù?Ù? Ú©Ø§Ø± Ù?Ù?Û?â??Ú©Ù?Ù?Ø¯!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ø§Ú¯Ø± ØªÙ?Ø± Ø´Ù?Ø§ Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯, Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ú©Ù?Û?Ø¯ %s."
@@ -164,48 +293,48 @@ msgstr "Ø§Ú¯Ø± ØªÙ?Ø± Ø´Ù?Ø§ Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯, Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø§Û?Ù?Û?Ù? Ú©
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Ø³Ø¹Û? Ú©Ù?Û?Ø¯ ØªØ§ Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±Û? Ø±Ø§ Ù?Ø±Ø§Ù?Ù? Ú©Ù?Û?Ø¯. Ø§Ø² Ø¬Ù?Ù?Ù? Ù?Û?Ø³Øª Ù¾Ù? Ù?Ø§ Ù? Pluggable Transports Ù?Ø§Û?Û? Ú©Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ø¯. Ù?Ù?Ú?Ù?Û?Ù? Ø´Ù?Ø§Ø±Ù? Ù?Ø³Ø®Ù? Tor Browser Ù? Ù?Ø± Ù¾Û?ØºØ§Ù?Û? Ú©Ù? Tor Ø¨Ù? Ø´Ù?Ø§ Ø¯Ø§Ø¯Ù? Ø§Ø³Øª."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ø®Ø·Ù?Ø· Ù¾Ù? Ø´Ù?Ø§ Ø¯Ø± Ø§Û?Ù?Ø¬Ø§:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù? Ù?Ø§!"
+msgstr "Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ù?Ø·Ù?Ø§ Ú¯Ø²Û?Ù?Ù? Ù?Ù?Ø¹ Ù¾Ù? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? IPv6 Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ø¢Û?Ø§ Ø´Ù?Ø§ Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯ Ø¨Ù? Û?Ú© %sØ?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ù?Ø±Ù?Ø±Ú¯Ø± Ø´Ù?Ø§ ØªØµØ§Ù?Û?Ø± Ø±Ø§ Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ù?Ù?Ø§Û?Ø´ Ù?Ù?Û? Ø¯Ù?Ø¯."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ú©Ø§Ø±Ø§Ú©ØªØ± Ù?Ø§ Ø±Ø§ Ø§Ø² ØªØµÙ?Û?Ø± Ø¨Ø§Ù?Ø§ Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? Ø§Ø² Ù¾Ù?â??Ù?Ø§Û? Ø®Ù?Ø¯ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -214,21 +343,21 @@ msgid ""
 msgstr "Ø¨Ø±Ø§Û? Ù?Ø±Ù?Ø¯ Ø¨Ù? Ù¾Ù? Ø¯Ø± Ù?Ø±Ù?Ø±Ú¯Ø± Tor Ø? Ø¨Ø±Ø§Û? Ø§Ù?Ù?Û?Ù? Ø¨Ø§Ø± %s Ø¨Ù? Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø±Ù?Ø±Ú¯Ø± Tor \nØµÙ?ØÙ? %s Ù? Ù¾Ø³ Ø§Ø² Ø¢Ù? Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Ø¯Ø³ØªÙ?Ø±Ø§Ù?Ø¹Ù?Ù?  Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø²\nÙ?Ø±Ù?Ø±Ú¯Ø± Tor Ø¨Ø±Ù?Û?Ø¯."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -236,153 +365,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'Ø¨Ù?Ù?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù? Ù? Ø³Ù¾Ø³ 'Ø¨Ø¹Ø¯Û?' Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯. Ø¨Ø±Ø§Û? Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ù¾Ù? Ø¬Ø¯Û?Ø¯ Ø®Ù?Ø¯, copy Ù? paste Ú©Ù?Û?Ø¯ Ø®Ø·Ù?Ø· Ù¾Ù? Ø±Ø§ Ø¯Ø± Ù?ØªÙ? Ø¬Ø¹Ø¨Ù? Ù?Ø±Ù?Ø¯Û?. Ø¯Ø± Ù?Ù?Ø§Û?Øª, Ø±Ù?Û? 'Ø§ØªØµØ§Ù?' Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯,\nØ±Ø§Ù? Ø¯Ø±Ø³ØªØ´ Ø§Û?Ù? Ø§Ø³Øª! Ø§Ú¯Ø± Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?Ø¯, Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ Ø±Ù?Û? Ú©Ù?Û?Ø¯ 'Ø±Ø§Ù?Ù?Ù?Ø§'\nØ¯Ø± 'ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù? ØªÙ?Ø±' wizard Ø¨Ø±Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr "Ø§Û?Ù? Ù¾Û?Ø§Ù? Ø±Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Û? Ø¯Ù?Ø¯."
+msgstr "Ø§Û?Ù? Ù¾Û?Ø§Ù? Ø±Ø§ Ù?Ù?Ø§Û?Ø´ Ù?Û?â??Ø¯Ù?Ø¯."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? Ø¹Ø§Ø¯Û?"
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?â??Ù?Ø§Û? IPv6"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ø±Ù?Ø´ Transport Ø¬Ø§Û?Ú¯Ø²Û?Ù? Ø¨Ø±Ø§Ø³Ø§Ø³ TYPE"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ú©Ù¾Û? Ø§Ø² Ú©Ù?Û?Ø¯ Ø¹Ù?Ù?Ù?Û? BridgeDB"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ØªÙ?Ø§Ø³"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ù?"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Ù?Ù?Ø§Û?Ø´ QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode Ø¨Ø±Ø§Û? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ø§Ù?Ù? Ø§Ù?Ù?Ø? Ú©Ù?Ø³Ø±Ù? Ø§Ø³Ù¾Ø§Ú¯ØªÛ?!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ø¨Ù? Ù?Ø¸Ø± Ù?Û? Ø±Ø³Ø¯ Û?Ú© Ø®Ø·Ø§ Ø¯Ø± Ú¯Ø±Ù?ØªÙ? QRCode Ø´Ù?Ø§ Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø±Ø¯."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ø§Û?Ù? QRCode Ø´Ø§Ù?Ù? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯. Ø§Ø³Ú©Ù? Ø¢Ù? Ø±Ø§ Ø¨Ø§ Û?Ú© Ø®Ù?Ø§Ù?Ù?Ø¯Ù? QRCode Ø¨Ø±Ø§Û? Ú©Ù¾Û? Ø®Ø·Ù?Ø· Ù¾Ù? Ø®Ù?Ø¯ Ø¨Ø± Ø±Ù?Û? ØªÙ?Ù?Ù? Ù?Ù?Ø±Ø§Ù? Ù? Ø¯Ø³ØªÚ¯Ø§Ù? Ù?Ø§Û? Ø¯Û?Ú¯Ø±."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ù?Û?Ú? Ù¾Ù? Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù?Û?Ø³Øª"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " Ø´Ø§Û?Ø¯ Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ Ø³Ø¹Û? Ú©Ù?Û?Ø¯ %s Ø¨Ø§Ø²Ú¯Ø´Øª %s Ù? Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ù?Ø¹ Ù¾Ù? Ù?Ø§Û? Ù?Ø®ØªÙ?Ù?!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ù?Ø±ØÙ?Ù? %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ù?Ø±ØÙ?Ù? %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ø¯Ø±Û?Ø§Ù?Øª %s Ù¾Ù?â?? Ù?Ø§  %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ù?Ø±ØÙ?Ù? %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "ØØ§Ù?Ø§ %s Ø§Ø¶Ø§Ù?Ù? Ú©Ø±Ø¯Ù? Ù¾Ù? Ù?Ø§ Ø¨Ù? Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÙ?%sÙ?Ø· Ø¨Ø¯Ù? Ø¨Ù? Ù?Ù? Ù¾Ù? Ù?Ø§ Ø±Ø§!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ú¯Ø²Û?Ù?Ù? Ù?Ø§Û? Ù¾Û?Ø´Ø±Ù?ØªÙ?"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ù?Ù?"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sØ¨%sÙ?Ù?!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sØ¯%sØ±Û?Ø§Ù?Øª Ù¾Ù?â??Ù?Ø§"
+msgstr "Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ø±Ù?Ù?Ù?Ø´Øª Ø§Ø² Ú©Ù?Û?Ø¯Ù? GnuPG Ø¹Ù?Ù?Ù?Û?Ù? BridgeDB"
diff --git a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
index 1b4028d..73a05e2 100644
--- a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
@@ -3,26 +3,29 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Hessu Lumberi <pitkahessu@xxxxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2015
 # Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2014
 # Spacha <miikasikala96@xxxxxxxxx>, 2015
 # Ossi Kallunki <ossikallunki@xxxxxxxxx>, 2013
+# Pietu1998 <smiley@xxxxxxxxxxxxx>, 2016
 # Riku Viitanen <riisseli4@xxxxxxxxx>, 2015
 # Sami Kuusisto <sami@xxxxxxxx>, 2014
+# Thomas <lab777ee@xxxxxxxxxxx>, 2015
 # viljaminojonen <Viljami.Nojonen@xxxxxxxx>, 2014
 # Finland355 <ville.ehrukainen2@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-05 15:01+0000\n"
-"Last-Translator: Riku Viitanen <riisseli4@xxxxxxxxx>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -37,57 +40,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "PyyntÃ¶si epÃ¤onnistui jostain syystÃ¤."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ilmoita ohjelmointivirheestÃ¤"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "LÃ¤hdekoodi"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Muutosloki"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Yhteystieto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "NÃ¤ytÃ¤ QR-koodi"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Siltariviesi QR-koodi"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Jossain on pulma!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Tapahtui virhe QR-koodia noudettassa."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "TÃ¤mÃ¤ QR-koodi sisÃ¤ltÃ¤Ã¤ siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "TÃ¤llÃ¤ hetkellÃ¤ ei ole yhtÃ¤Ã¤n siltaa saatavilla..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "EhkÃ¤ sinun pitÃ¤isi yrittÃ¤Ã¤ %s palaamalla %s ja valitsemalla eri siltatyyppi!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Vaihe %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Lataa %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Vaihe %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hanki %s sillat %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Vaihe %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sA%snna minulle vain sillat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "LisÃ¤valitsimet"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ei mitÃ¤Ã¤n"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sK%syllÃ¤!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sae sillat"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[TÃ¤mÃ¤ on automaattinen viesti; Ã¤lÃ¤ vastaa tÃ¤hÃ¤n.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "TÃ¤ssÃ¤ ovat sinun siltasi."
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Olet ylittÃ¤nyt nopeusrajan. Hidasta hiukan! Minimiaika viestien vÃ¤lillÃ¤ on %s tunnissa. Kaikki lisÃ¤viestit tÃ¤mÃ¤n ajan kuluessa ohitetaan."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMENNOT: (yhdistÃ¤ KOMENNOT mÃ¤Ã¤ritellÃ¤ksesi useita valitsimia samanaikaisesti)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Tervetuloa BridgeDB :hen!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Nykyiset tuetut transport TYPE-siirtotyypit:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hei, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hei ystÃ¤vÃ¤!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -98,7 +226,7 @@ msgstr "TÃ¤mÃ¤ sÃ¤hkÃ¶posti tuotettiin kÃ¤yttÃ¤jÃ¤lle %s %s klo %s"
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,7 +237,7 @@ msgid ""
 msgstr "BridgeDB voi tarjota usean %styyppisiÃ¤ irrotettavia Pluggable Transports%s-siirtoja,\njotka voivat auttaa peittÃ¤mÃ¤Ã¤n yhteytesi Tor Network-verkkoon, mikÃ¤ tekee vaikeammaksi\nkenellekÃ¤Ã¤n seurata internet-liikennettÃ¤si ottaakseen selvÃ¤Ã¤, ettÃ¤ kÃ¤ytÃ¤tkÃ¶ Tor-palvelua.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -121,7 +249,7 @@ msgstr "MyÃ¶s joitakin siltoja IPv6-osoitteilla on saatavilla, vaikka jotkut irr
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +258,20 @@ msgid ""
 "\n"
 msgstr "LisÃ¤ksi BridgeDB:llÃ¤ on useita tavallisia siltoja %s ilman mitÃ¤Ã¤n irrotettavia\nPluggable Transports %s-siirtoja, jotka eivÃ¤t ehkÃ¤ kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertÃ¤mÃ¤Ã¤n internet-sensuuria.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "MitÃ¤ ovat sillat?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s-sillat %s ovat Tor-vÃ¤litysjÃ¤rjestelmiÃ¤, jotka auttavat kiertÃ¤mÃ¤Ã¤n sensurointia."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +279,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoitteeseen %s. Huomaa,\nettÃ¤ sinun on lÃ¤hetettÃ¤vÃ¤ sÃ¤hkÃ¶postiviesti kÃ¤yttÃ¤en yhtÃ¤ seuraavien sÃ¤hkÃ¶postitarjoajien\nosoitetta:\n%s, %s tai %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Siltani eivÃ¤t toimi! Tarvitsen apua!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Jos Tor ei toimi sinulla, sinun pitÃ¤isi sÃ¤hkÃ¶postittaa %s."
@@ -164,71 +292,71 @@ msgstr "Jos Tor ei toimi sinulla, sinun pitÃ¤isi sÃ¤hkÃ¶postittaa %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "YritÃ¤ sisÃ¤llyttÃ¤Ã¤ niin paljon tietoa tapauksestasi kuin voit, mukaanlukien siltojen\nluettelo ja irrotettavat Pluggable Transport-siirrot, joita yritit kÃ¤yttÃ¤Ã¤,\nTor Browser-versio, ja kaikki viestit, jotka Tor ilmoitti, jne."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "TÃ¤ssÃ¤ ovat siltarivisi:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Hae sillat!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Valitse valitsimet siltatyypille:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Tarvitsetko IPv6-osoitteita?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Tarvitsetko %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Selaimesi ei nÃ¤ytÃ¤ kuvia oikein."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "SyÃ¶tÃ¤ merkit ylÃ¤puolella olevasta kuvasta..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Kuinka aloitat siltojesi kÃ¤ytÃ¶n"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "LsiÃ¤tÃ¤ksesi siltoja Tor-selaimeen, mene %s Tor-selaimen lataussivulle %s ja seuraa ohjeita siellÃ¤ ladataksesi ja kÃ¤ynnistÃ¤Ã¤ksesi Tor-selaimen."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "EstÃ¤Ã¤kÃ¶ tai sensuroiko Internet-palvelutarjoajasi (ISP) muuten yhteyksiÃ¤\nTor-verkkoon?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -236,153 +364,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "NÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n viestin."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "PyydÃ¤ tavallisia siltoja."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "PyydÃ¤ IPv6-siltoja."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ilmoita ohjelmointivirheestÃ¤"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "LÃ¤hdekoodi"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Muutosloki"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Valitse kaikki"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "NÃ¤ytÃ¤ QR-koodi"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Siltariviesi QR-koodi"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Jossain on pulma!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Tapahtui virhe QR-koodia noudettassa."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "TÃ¤mÃ¤ QR-koodi sisÃ¤ltÃ¤Ã¤ siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "TÃ¤llÃ¤ hetkellÃ¤ ei ole yhtÃ¤Ã¤n siltaa saatavilla..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "EhkÃ¤ sinun pitÃ¤isi yrittÃ¤Ã¤ %s palaamalla %s ja valitsemalla eri siltatyyppi!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Vaihe %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Lataa %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Vaihe %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hanki %s sillat %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Vaihe %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nyt %s lisÃ¤Ã¤ sillat Tor Browseriin %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sA%snna minulle vain sillat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "LisÃ¤valitsimet"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ei"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sae sillat"
diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 65015dc..32c57a7 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -3,34 +3,40 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2019
 # apaddlingduck, 2014
 # Boubou <cece31840@xxxxxxxxx>, 2015
 # Cryptie <cryptie@xxxxxxxx>, 2014
 # elouann, 2015
-# fayÃ§al fatihi, 2014
+# fayÃ§al fatihi <ofaycal.geo.x@xxxxxxxxx>, 2014
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2017-2018
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2016-2017
 # Frisson Reynald <frissonreynald@xxxxxxxx>, 2014
-# hpatte <hadrien.44@xxxxxxxxx>, 2014
+# hpatte, 2014
 # Lucas Leroy <lerlucas@xxxxxxxxxxxxxx>, 2014
 # Lunar <lunar@xxxxxxxxxxxxxx>, 2013
 # Onizuka, 2013
 # mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011
+# Olivier <calicoj@xxxxxx>, 2015
 # Onizuka, 2013
+# Sabrina Cater <sabcat@xxxxxx>, 2015
+# syl_, 2016
 # themen <themen2004@xxxxxxxxx>, 2014
 # Towinet, 2014-2015
-# Trans-fr, 2015
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2015
 # Yannick Heintz, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-24 16:42+0000\n"
-"Last-Translator: elouann\n"
-"Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-17 16:23+0000\n"
+"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
+"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -45,68 +51,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "DÃ©solÃ© ! Un problÃ¨me est survenu suite Ã  votre requÃªte."
+msgstr "DÃ©solÃ©â??! Un problÃ¨me est survenu Ã  la suite de votre requÃªte."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Signaler un bogue"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Code source"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Journal des changements"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tout sÃ©lectionner"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Afficher le code QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Code QR pour vos lignes de ponts"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Un problÃ¨me est survenuâ??!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Il semble quâ??il y ait eu une erreur de rÃ©cupÃ©ration de votre code QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ce code QR contient vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont (Bridges) sur vos appareils, mobiles ou autres."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aucun pont nâ??est disponible actuellementâ?¦"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Vous devriez peut-Ãªtre %s revenir en arriÃ¨re %s et choisir un diffÃ©rent type de pontâ??!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ã?tape %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "TÃ©lÃ©charger %s le NavigateurÂ Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ã?tape %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obtenir des %s ponts %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ã?tape %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Maintenant, %s ajouter les ponts au navigateur Le NavigateurÂ Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "Donnez-moi %sj%suste des pontsâ??!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Options avancÃ©es"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "aucun"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sO%suiâ??!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbtenir des ponts"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ceci est un message automatique, merci de ne pas rÃ©pondre.]"
+msgstr "[Ceci est un message automatisÃ© ; veuillez ne pas y rÃ©pondre.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Voici vos bridges :"
+msgstr "Voici vos ponts :"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Vous avez dÃ©passÃ© la limite. Veuillez ralentir !  La durÃ©e minimum entre courriels\nest de %s heures. Tout autre courriel durant cette pÃ©riode sera ignorÃ©."
+msgstr "Vous avez dÃ©passÃ© la limite. Veuillez ralentirâ??! La durÃ©e minimum entre courriels est de %s heures. Tout autre courriel durant cette pÃ©riode sera ignorÃ©."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDES: (combiner des commandes pour spÃ©cifier plusieurs options en mÃªme temps)"
+msgstr "COMMANDES : (combiner des commandes pour spÃ©cifier plusieurs options simultanÃ©ment)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr "Bienvenue Ã  BridgeDB!"
+msgstr "Bienvenue Ã  BridgeDBâ??!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport pris en charge actuellement:"
+msgstr "TYPE de transport pris en charge actuellement :"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "Salut, %s!"
+msgstr "Bonjour, %sâ??!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Bonjour, l'ami !"
+msgstr "Bonjour, lâ??amiâ??!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "ClÃ©s publiques"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Ce courriel a Ã©tÃ© gÃ©nÃ©rÃ© avec des arcs en ciel, des licornes, et des Ã©tincelles pour %s, %s Ã  %s."
+msgstr "Ce courriel a Ã©tÃ© gÃ©nÃ©rÃ© avec des arcs en ciel, des licornes et des Ã©tincelles pour %s le %s Ã  %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -114,57 +245,57 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB peut fournir des bridges avec plusieurs %stypes de transports enfichables%s, qui peuvent aider Ã  brouiller vos connexions au rÃ©seau Tor, ce qui rend plus difficile pour tous ceux qui regardent votre trafic Internet de dÃ©terminer que vous utilisez Tor.\n"
+msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider Ã  brouiller vos connexions vers le rÃ©seauÂ Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de dÃ©terminer que vous utilisez Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Certains bridges avec les adresses IPv6 sont Ã©galement disponibles, bien que certains Transports soient enfichables ; ils ne sont pas compatibles avec l'IPv6.\n"
+msgstr "Certains ponts sont aussi proposÃ©s avec des adresses IPv6, bien que certains transports enfichables ne soient pas compatibles avec IPv6.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "De plus, BridgeDB contient beaucoup de bridges \"classiques\" %s sans aucun\nTransports Enfichables (Pluggable Transports) %s, ne semblant pas Ãªtre aussi cool, mais pouvant toutefois\naider Ã  contourner la censure Internet dans des nombreux cas.\n"
+msgstr "De plus, BridgeDB propose de nombreux ponts traditionnels %s sans transport enfichable %s qui peuvent quand mÃªme aider Ã  contourner la censure Internet dans bien des cas.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Que sont les bridges ?"
+msgstr "Que sont les pontsâ???"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridges %s sont des relais Tor qui vous aident Ã  contourner la censure."
+msgstr "%s Les ponts%s sont des relaisÂ Tor qui vous aident Ã  contourner la censure."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !"
+msgstr "Il me faut une autre faÃ§on dâ??obtenir des pontsâ??!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Une autre faÃ§on d'obtenir des ponts est d'envoyer un courriel Ã  %s. Veuillez prendre\nnote que vous devez envoyer le courriel en utilisant une adresse d'un des fournisseurs\nde courriel suivants :\n%s, %s ou %s."
+msgstr "Une autre faÃ§on dâ??obtenir des ponts est dâ??envoyer un courriel Ã  %s. Veuillez prendre note que vous devez envoyer le courriel en utilisant une adresse provenant dâ??un des fournisseurs de courriel suivantsÂ :\n%s, %s ou %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !"
+msgstr "Mes ponts ne fonctionnent pas, jâ??ai besoin dâ??aideâ??!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel Ã  %s."
@@ -172,225 +303,100 @@ msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel Ã  %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Essayez d'inclure autant d'infos que possible concernant votre cas, y compris la liste des\nponts et des Transports Enfichables (Pluggable Transports) que vous avez essayÃ© d'utiliser, votre version de Tor Browser,\net n'importes quel autres messages que Tor vous a sorti, etc."
+msgstr "Essayez dâ??inclure autant de renseignements sur votre cas que possible, incluant la liste de ponts et de transports enfichables que vous avez essayÃ© dâ??utiliser, votre version du NavigateurÂ Tor et tout message donnÃ© par Tor, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Voici vos lignes de bridges:"
+msgstr "Voici vos lignes de pontsâ??:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Obtenez des bridges !"
+msgstr "Obtenez des pontsâ??!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "SÃ©lectionnez vos choix pour le type de bridge, s'il vous plaÃ®t:"
+msgstr "Veuillez choisir des options pour le type de pontsâ??:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Avez-vous besoin des adresses IPv6?"
+msgstr "Avez-vous besoin dâ??adresses IPv6â???"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Avez-vous besoin un %s?"
+msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Votre navigateur n'affiche pas correctement les images."
+msgstr "Votre navigateur nâ??affiche pas les images correctement."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Inscrire les caractÃ¨res de l'image ci-dessusâ?¦"
+msgstr "Saisir les caractÃ¨res de lâ??image ci-dessusâ?¦"
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Comment dÃ©marrer l'utilisation de vos Bridges."
+msgstr "Comment commencer Ã  utiliser vos pontsâ???"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Pour entrer (saisir) des bridges dans le Navigateur Tor (Tor Browser), allez tout d'abord Ã  la %s page de tÃ©lÃ©chargement du navigateur Tor %s puis suivez les instructions lÃ -bas afin de tÃ©lÃ©charger puis dÃ©marrer le navigateur Tor."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Quand la boite de dialogue 'ParamÃ¨tres RÃ©seaux Tor' s'affiche, cliquez 'Configurer' et suivez l'assistant jusqu'Ã  ce quâ??il demande :"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Est-ce que votre fournisseur d'accÃ¨s Ã  Internet (FAI) bloquent ou censurent les connexions vers le rÃ©seau Tor ?"
+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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "SÃ©lectionnez 'Oui' et ensuite cliquez 'Suivant'. Pour configurer vos nouveaux bridges, copiez et collez les lignes bridges dans le champ de texte. Enfin, cliquez 'Connexion', et tout devrait marcher ! Si vous avez des difficultÃ©s, essayez le bouton 'Aide' dans 'ParamÃ¨tres RÃ©seaux Tor' pour plus dâ??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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr "Afficher ce 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.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Demander des bridges \"classiques\"."
+msgstr "Demander des ponts traditionnels."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Demander des bridges IPv6."
+msgstr "Demander des ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demander un Pluggable Transport par TYPE."
+msgstr "Demander un transport enfichable par TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Signaler un bogue"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Le code source"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Tout sÃ©lectionner"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Montrer QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode pour vos lignes de bridges"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "HoulÃ !"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Il semblerait qu'il y ai eu une erreur en chargeant votre QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ce QRCode contient vos lignes de bridge. Scannez-le avec un lecteur de QRCode pour copier vos lignes de bridge dans votre mobile ou d'autres appareils."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Il n'y a pas de bridge disponible en ce momentâ?¦"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Peut-Ãªtre vous devriez revenir %s en arriÃ¨re %s et choisir un diffÃ©rent type de bridge !"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Etape %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "TÃ©lÃ©charger %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Etape %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "RÃ©cupÃ©rez les %s addresses de bridge %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Etape %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Maintenant %s ajoutez les bridges au navigateur Tor %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "Donnez-moi %sj%suste des bridges !"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Options avancÃ©es"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Non"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtenir des bridges"
+msgstr "Obtenir une copie de la clÃ© GnuPG publique de BridgeDB."
diff --git a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
index 6aff6d7..6d5e9ac 100644
--- a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,385 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Eu <luz.armas@xxxxxx>, 2014
 # manuel meixide <m.meixide@xxxxxxxxx>, 2013
-# mbouzada <mbouzada@xxxxxxxxx>, 2013
+# Miguel Anxo Bouzada <mbouzada@xxxxxxxxx>, 2013
+# pepepenha <pepepenha@xxxxxxxxxxx>, 2014
+# Xnake, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-08 15:33+0000\n"
-"Last-Translator: manuel meixide <m.meixide@xxxxxxxxx>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-02-06 11:07+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"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "SentÃmolo! Algo foi mal coa sÃºa solicitude."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Informar dun Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "CÃ³digo Fonte"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Rexistro de Cambios"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Amosar CÃ³digo QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "CÃ³digo QR para as sÃºas liÃ±as ponte"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Semella que houbo un erro obtendo o seu CÃ³digo QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Este CÃ³digo QR contÃ©n as sÃºas liÃ±as ponte. EscanÃ©eo cun lector de cÃ³digos QR para copiar as sÃºas liÃ±as ponte nun mÃ³bil e outros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Non hai pontes dispoÃ±ibles agora mesmo..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Quizais deberÃa tentar %s indo hacia atrÃ¡s %s i elexindo un tipo de ponte diferente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Paso %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descargar %s Tor Bowser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Paso %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter as %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Paso %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora %s engada as pontes ao Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%sÃ³amente dame pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "OpciÃ³ns Avanzadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ningÃºn"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%si!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbter Pontes"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Esta Ã© unha mensaxe automÃ¡tica; por favor non responda.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Estes son os seus bridges:"
+
+#: bridgedb/strings.py:47
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Excedeu o lÃmite de taxa. Por favor vaia a modo! O tempo mÃnimo entre correos electrÃ³nicos Ã© %s horas. Todos os novos correos electrÃ³nicos durante este perÃodo de tempo serÃ¡n ignorados."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMANDOs: (combinar COMANDOs para especificar mÃºltiples opciÃ³ns simultÃ¡neamente)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "DÃ¡moslle a benvida a BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "TIPOs de transporte soportados actualmente:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Ola, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Ola amigo/a!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Claves pÃºblicas"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Este email foi xenerado con arcos da vella, unicornios, e faÃscas\npara %s en %s Ã¡s %s."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB pode proporcionar pontes con distintos %stipos de Transportes Enchufables%s,\nque poden axudar a ofuscar a sÃºas conexiÃ³ns Ã¡ Rede Tor, facendo mÃ¡is\ndifÃcil para calquera que vixÃe o seu trÃ¡fico de internet determinar se vostede estÃ¡\nempregando Tor.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "TamÃ©n estÃ¡n dispoÃ±ibles algunhas pontes con direcciÃ³ns IPv6, aÃnda que algÃºns Transportes\nEnchufables non son compatibles con IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Adicionalmente, BridgeDB ten unha morea de pontes tradicionais de toda a vida %s sen ningÃºn\nTransporte Enchufable %s o que non pode sonar molÃ³n, pero todavÃa\naxudan a evitar a censura de internet en moitos casos.\n\n"
+
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Que son os repetidores ponte?"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
 #, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Repetidores Ponte %s son repetidores Tor que axudan a burlar a censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Pontes %s son retransmisores Tor que lle axudan a evitar a censura."
 
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Eu necesito un xeito alternativo de obter pontes!"
 
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Outra forma de atopar os enderezos de pontes pÃºblicas Ã© enviar un correo electrÃ³nico (desde un %s ou un enderezo %s) para %s coa liÃ±a 'get bridges' por si soa no corpo do correo electrÃ³nico."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "Outro xeito de obter pontes e enviando un email a %s. Por favor teÃ±a en conta que debe\nenviar o email empregando unha direcciÃ³n dende un dos seguintes proveedores de email:\n%s, %s ou %s."
 
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "As miÃ±as pontes non funcionan! Necesito axuda!"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
 #, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se o Tor non funciona, ten que enviar un correo-e a %s. Probe incluÃr tanta informaciÃ³n sobre o seu caso como poida, incluÃndo a lista de pontes que usou, o nome do paquete/versiÃ³n que usou, as mensaxes que Tor lle deu , etc"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
 
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para usar as liÃ±as mÃ¡is arriba, ten que ir Ã¡ pÃ¡xina de ConfiguraciÃ³n de rede do Vidalia, e premer en \"O meu ISP bloquea as conexiÃ³ns Ã¡ rede Tor\". A continuaciÃ³n, engada un enderezo dunha ponte de cada vez."
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "Tente incluir tanta informaciÃ³n como poida acerca do seu caso, incluindo a lista de\npontes de Transportes Enchufables que tentou usar, a sÃºa versiÃ³n do Tor Browser,\ne calquera mensaxes que Tor dera, etc."
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Non hai pontes actualmente dispoÃ±ibles"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Estas son as sÃºas liÃ±as ponte:"
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualiza o teu navegador a Firefox"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Obter Pontes!"
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escriba as dÃºas palabras"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Por favor seleccione opciÃ³ns para o tipo de ponte:"
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Paso 1"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Necesita direcciÃ³ns IPv6?"
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obter o %s Paquete Navegador Tor %s"
+msgid "Do you need a %s?"
+msgstr "Necesita vostede un %s?"
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Paso 2"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "O seu navegador non estÃ¡ amosando imaxes adecuadamente."
 
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obter as %s pontes %s"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Introduza os caracteres da imaxen de enrriba..."
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Paso 3"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "CÃ³mo comenzar a usar as sÃºas pontes"
 
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora %s engada as pontes a Tor %s"
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Para introducir pontes no Tor Browser, primeiro vaia Ã¡ %s pÃ¡xina de descarga de\nTor Browser %s e siga as instrucciÃ³ns dadas para descargar e arrancar\no Tor Browser."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Cando apareza o diÃ¡logo 'Axustes de Rede de Tor', prema 'Configurar' e siga\no asistente ata que pregunte:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "O seu Porveedor de Servicios de Internet (ISP) bloquea ou censura conexiÃ³ns\nÃ¡ rede Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Seleccione 'Si' e prema en 'Seguinte'. Para configurar as sÃºas novas pontes, copie e\npegue as liÃ±as ponte na caixa de entrada de texto. Finalmente, prema 'Conectar', e\ndeberÃa poder comenzar! Se ten algÃºn problema, intente premendo o botÃ³n\n'Axuda' no asistente de 'Axustes de Rede de Tor' para axuda adicional."
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "Amosa esta mensaxe."
+
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Solicitar pontes estÃ¡ndar."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Solicitar pontes IPv6"
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Solicitar un Transporte Enchufable por TIPO."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Obter unha copia da clave pÃºblica GnuPG de BridgeDB."
diff --git a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
index f700478..6419a0b 100644
--- a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
@@ -1,105 +1,391 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
-# aharonoosh <aharonoosh1@xxxxxxxxx>, 2012
+# aharon, 2012
 # Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
-# GenghisKhan <genghiskhan@xxxxxx>, 2013
+# Dvir Rosen <ndvnis@xxxxxxxxx>, 2014
+# GenghisKhan <genghiskhan@xxxxxx>, 2013,2015
+# ION, 2017-2018
+# Johnny Diralenzo, 2015
 # Kunda, 2014
-# Cuvint Chofschy <static.172@xxxxxxxxx>, 2012
+# Kunda, 2015
+# Ron Don, 2015
+# Ruben <drarbib@xxxxxxxxx>, 2014
+# static172 <static.172@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-30 12:30+0000\n"
-"Last-Translator: Kunda\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-17 12:25+0000\n"
+"Last-Translator: ION\n"
+"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "×¡×?×?×?×?! ×?×©×?×? ×?×©×ª×?×© ×?×?×§×©×? ×©×?×?."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "×?×?×?×? ×¢×? ×ª×§×?"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "×§×?×? ×?×§×?×¨"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "×?×?×?×? ×©×?× ×?×?×?×?"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "×¦×?×¨ ×§×©×¨"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "×?×?×¨ ×?×?×?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "×?×¦×? ×§×?×? QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "×§×?×? QR ×?×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "×?×?×? ×?×?×?×?×?!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "× ×¨×?×? ×©× ×¤×?×? ×?×¢×?×ª ×?×§×?×?×ª ×§×?×? ×?-QR ×©×?×?."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "×§×?×? QR ×?×? ×?×?×?×? ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×?. ×¡×¨×?×§ ×?×?×ª×? ×?×?×?×¦×¢×?×ª ×§×?×¨×? ×§×?×? QR ×¢×? ×?× ×ª ×?×?×¢×ª×?×§ ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×©×?×? ×?×?×?×¤×?×? × ×?×?×? ×?×?×?×©×?×¨×?×? ×?×?×¨×?×?."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "×?×?×? ×?×¨×?×¢ ×?×©×¨×?×? ×?×?×?× ×?×? ×?×?×©×?×?..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "× ×¡×? ×?×?×?×?×¨ %s ×?×?×?×?×¨ %s ×?×?×?×?×?×¨ ×?×©×¨ ×?×¡×?×? ×?×?×¨!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "×©×?×? %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "×?×?×¨×? ×?×ª %s ×?×¤×?×¤×? Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "×©×?×? %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "×?×©×? %s ×?×©×¨×?×? %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "×©×?×? %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×?×¤×?×¤×? Tor %s ×¢×?×©×?×?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s×¨%s×§ ×ª×? ×?×? ×?×©×¨×?×?!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "×?×¤×©×¨×?×?×?×ª ×?×ª×§×?×?×?×ª"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "×?×?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "×?×£ ×?×?×?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%s×?%s×?!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s×§%s×?×? ×?×©×¨×?×?"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[×?×?×?×? ×?×?×?×¢×? ×?×?×?×?×?×?×?×ª; × ×? ×?×? ×?×?×©×?×?.]"
 
-#: lib/bridgedb/templates/base.html:33
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "×?× ×? ×?×?×©×¨×?×? ×©×?×?:"
+
+#: bridgedb/strings.py:47
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "×?×¨×?×ª ×?×?×?×?×?×ª ×?×§×¦×?. ×?× ×? ×?×?×?! ×?×?×?×? ×?×?×?×¢×¨×? ×?×?×? ×?×?×?×´×?×?×? ×?×?×? %s ×©×¢×?×ª. ×?×? ×?×?×?×?×´×?×?×? ×?× ×?×¡×¤×?×? ×?×?×?×?×? ×¤×¨×§ ×?×?×? ×?×? ×?×?×ª×§×?×? ×?×?×ª×¢×?×?×?×ª."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "×¤×§×?×?×?×ª: (×©×?×? ×¤×§×?×?×?×ª ×?×?×? ×?×¦×?×?×? ×?×¤×©×¨×?×?×?×ª ×?×¨×?×?×?×ª ×?×?Ö¾×?×?× ×?×ª)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "×?×¨×?×? ×?×?×? ×?×? BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "transport TYPEs ×?× ×ª×?×?×?×? ×?×¨×?×¢:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "×?×?×?, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "×©×?×?×?, ×?×?×¨!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "×?×¤×ª×?×?×ª ×¦×?×?×?×¨×?×?×?"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "×?×?×?\"×? ×?×? × ×?×¦×¨ ×¢×? ×§×©×ª×?×ª ×?×¢× ×?, ×?×?×?Ö¾×§×¨×? ×?× ×¦× ×¦×?×?\n×¢×?×?×¨ %s ×?×ª×?×¨×?×? %s ×?×©×¢×? %s."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB ×?×?×?×? ×?×¡×¤×§ ×?×©×¨×?×? ×¢×? ×?×¡×¤×¨ ×¡×?×?×?×? ×©×? %s×?×¡×?×?×? ×ª×¢×?×?×¨×?%s, ×?×?×¡×?×?×¢×?×? ×?×?×©×?×© ×?×ª ×¢×§×?×?×ª ×?×ª×?×?×¨×?×ª×? ×?×¨×©×ª Tor ×?×?×?×? ×?×§×©×?×? ×¢×? ×?×?×¨×?×?×? ×?×?×¤×§×?×?×? ×¢×? ×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×?×?×?×? ×?×?×? ×©×?×ª×? ×¢×?×©×? ×©×?×?×?×© ×?-Tor.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "×?×¡×¤×¨ ×?×©×¨×?×? ×¢×? ×?×ª×?×?×?×ª IPv6 ×?×?×?× ×?×? ×?×? ×?×?, ×?×¢\"×¤ ×©×?×¡×¤×¨ ×ª×¢×?×?×¨×?×ª × ×ª×?×§×?×ª ×?×?× ×? ×ª×?×?×?×?×ª IPv6.\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "×?× ×?×¡×£, ×?-BridgeDB ×?×© ×©×¤×¢ ×©×? ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×? ×?×?×?×?×? %s ×?×?×? ×?×¡×?×?×? ×ª×¢×?×?×¨×? ×?×?×©×?×? %s, ×?×? ×©×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?×¨ ×?×¢×§×?×£ ×¦× ×?×?×¨×ª ×?×?× ×?×¨× ×? ×?×?×§×¨×?×? ×¨×?×?×?.\n"
+
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "×?×?×? ×?×©×¨×?×??"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
 #, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ×?×?×¡×¨×? ×?×©×¨ %s ×?×?× ×? ×?×?×¡×¨×? Tor ×?×©×¨ ×?×¡×?×?×¢×?×? ×?×? ×?×¢×§×?×£ ×¦× ×?×?×¨×?."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s ×?×©×¨×?×? %s ×?×? ×?×?×¡×¨×? Tor ×?×¢×?×?×¨×?×? ×?×? ×?×¢×§×?×£ ×¦× ×?×?×¨×?."
 
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "×?× ×? ×?×§×?×§ ×?×?×¨×? ×?×?×?×¤×?×ª ×?×§×?×?×ª ×?×©×¨×?×?!"
+msgstr "×?× ×? ×¦×¨×?×? ×?×¨×? ×?×?×?×¤×?×ª ×?×§×?×?×ª ×?×©×¨×?×?!"
 
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "×?×¨×? ×?×?×¨×ª ×?×?×¦×?×?×ª ×?×ª×?×?×ª ×©×? ×?×©×¨ ×¤×?×?×?×? ×?×?× ×? ×©×?×?×?×ª ×?×?×?×´×? (×?×ª×?×? ×?×ª×?×?×ª %s ×?×? %s) ×?×? %s ×¢×? ×?×©×?×¨×? 'get bridges' ×?×©×?×¢×¦×?×? ×?×ª×?×? ×?×?×£ ×?×?×?×?×¢×?."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "×?×¨×? × ×?×¡×¤×ª ×?×?×©×?×? ×?×©×¨×?×? ×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s. ×?× ×? ×©×?×? ×?×? ×©×?×ª×? ×?×?×?×? ×?×©×?×?×? ×?×ª ×?×?×?×?×´×? ×¢\"×? ×©×?×?×?×© ×?×?×?×? ×?×¡×¤×§×? ×?×?×?×?\"×? ×?×?×?×?×?:\n%s, %s ×?×? %s."
 
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×?×§×?×§ ×?×¢×?×¨×?!"
+msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×¦×¨×?×? ×¢×?×¨×?!"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
 #, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "×?×? Tor ×?×? ×¢×?×?×? ×?×¦×?×?, ×¢×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×? %s. × ×¡×? ×?×?×?×?×? ×?×?×? ×©×?×?×ª×¨ ×?×?×?×¢ ×?×?×?×?×ª ×?×?×§×¨×? ×©×?×? ×?×?×? ×©×?×?×?×?×?×ª×? ×?×¢×©×?×ª ×?×?, ×?×?×?×? ×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×?×©×¨ ×?×©×ª×?×©×ª ×?×?, ×©×? ×?×§×?×?×¥/×?×¨×¡×? ×©×? ×?×?×?×?×?×? (bundle) ×©×?×©×ª×?×©×ª, ×?×?×?×?×¢×?×ª ×?×©×¨ Tor ×?×¡×¨ ×?×?×?×³."
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "×?×? Tor ×?×? ×¢×?×?×?, ×¢×?×?×? ×?×©×?×?×? ×?×?×?×´×? ×?×?%s."
 
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "×?×?×? ×?×?×©×ª×?×© ×?×©×?×¨×?×ª ×?×¢×?×?, ×?×?×©×? ×?×? ×¢×?×?×? ×?×?×?×¨×?×ª ×¨×©×ª ×?×ª×?×? Vidalia, ×?×?×§×?×§ \"×¡×¤×§ ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×¡×? ×?×?×?×?×¨×?×? ×?×¨×©×ª Tor\". ×?×?×¨×? ×?×? ×?×?×¡×£ ×?×? ×?×ª×?×?×ª ×?×©×¨ ×?×?×ª ×?×?×? ×¤×¢×?."
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "× ×¡×? ×?×?×?×?×? ×?×?×? ×©×?×?×ª×¨ ×¤×¨×?×?×? ×¢×? ×?×?×§×¨×? ×©×?×? ×?×?×? ×?×?×?×?×ª×?, ×?×¨×?×?×ª ×¨×©×?×?×ª ×?×?×©×¨×?×? ×?×?×¡×?×?×? ×?×ª×¢×?×?×¨×? ×?×?×ª×? × ×?×¡×?×ª, ×?×¨×¡×ª ×?×¤×?×¤×? Tor ×©×?×¨×©×?×ª×?, ×?×? ×?×?×?×¢×? ×?×ª×?×?×? ×©×?×ª×§×?×?×? ×?-Tor ×?×?×?×¡ ×?×?×¢×?×? ×?×?×? ×¤×¨×? × ×?×¡×£ ×©×¨×?×?×?× ×?×? ×?×¢×?× ×?×?."
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "×?×?×? ×?×©×¨×?×? ×?×?×?× ×?×? ×?×¢×ª"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "×?×?×?×? ×©×?×¨×?×ª ×?×?×©×¨ ×©×?×?:"
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "×©×?×¨×? ×?×ª ×?×?×¤×?×¤×? ×©×?×? ×?×? Firefox"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "×?×©×? ×?×©×¨×?×?!"
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "×?×§×© ×?×ª ×©×ª×? ×?×?×?×?×?×?"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "×?× ×? ×?×?×¨ ×?×¤×©×¨×?×?×?×ª ×?×¡×?×? ×?×?×©×¨:"
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "×¦×¢×? 1"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? ×?×ª×?×?×?×ª IPv6?"
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "×?×©×? ×?×ª %s ×?×?×?×?×ª ×?×?×¤×?×¤×? ×©×? Tor %s"
+msgid "Do you need a %s?"
+msgstr "×?×?×? ×?×ª×? ×¦×¨×?×? %s?"
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "×¦×¢×? 2"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "×?×?×¤×?×¤×? ×©×?×? ×?×? ×?×¦×?×? ×ª×?×?× ×?×ª ×?×¨×?×?×?."
 
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "×?×©×? %s ×?×©×¨×?×? %s"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "×?×?× ×¡ ×?×ª ×?×ª×?×?×?×? ×?×?×ª×?×?× ×? ×?×?×¢×?×?..."
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "×¦×¢×? 3"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "×?×?×? ×?×?×ª×?×?×? ×?×?×©×ª×?×© ×?×?×©×¨×?×? ×©×?×?"
 
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "×?×¢×ª %s ×?×?×¡×£ ×?×ª ×?×?×©×¨×?×? ×?×? Tor %s"
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "×?×?×? ×?×?×?× ×?×¡ ×?×©×¨×?×? ×?×ª×?×? ×?×¤×?×¤×? Tor, ×¨×?×©×?×ª ×?×? ×?×? %s ×?×£ ×?×?×¨×?×ª ×?×¤×?×¤×? Tor %s ×?×?×?×?×¨ ×?×?×? ×¢×§×?×? ×?×?×¨ ×?×?×?×¨×?×?×ª ×¢×?×?×¨ ×?×?×¨×?×? ×?×?×ª×?×?×? ×©×? ×?×¤×?×¤×? Tor."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "×?×?×©×¨ ×?×?×?Ö¾×©×?×? '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¦×?×¥, ×?×?×¥ ×¢×? '×?×?×?×¨' ×?×¢×§×?×? ×?×?×¨ ×?×?×©×£ ×¢×? ×©×?×?×? ×?×©×?×?:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "×?×?×? ×¡×¤×§ ×©×?×¨×?×ª×? ×?×?×?× ×?×¨× ×? ×©×?×? ×?×?×¡×? ×?×? ×?×¦× ×?×¨ ×?×?×?×?×¨×?×? ×?×? ×¨×©×ª Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "×?×?×¨ '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?×ª×¦×¨ ×?×ª ×?×?×©×¨×?×? ×?×?×?×©×?×? ×©×?×?, ×?×¢×ª×§ ×?×?×?×?×§ ×?×ª ×©×?×¨×?×ª ×?×?×©×¨×?×? ×?×ª×?×? ×ª×?×?×ª ×?×§×?×? ×©×? ×?×?×?×?. ×?×?×¡×?×£, ×?×?×¥ ×¢×? '×?×ª×?×?×¨' ×?×?×ª×? ×?×?×?×¨ ×?×?×?×?×ª ×?×?×?×?! ×?×? ×ª×?×?×?×? ×ª×§×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?×¤×ª×?×¨ '×¢×?×¨×?' ×?×?×©×£ '×?×?×?×¨×?×ª ×¨×©×ª Tor' ×?×¡×?×?×¢ × ×?×¡×£."
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "×?×¦×?×? ×?×?×?×¢×? ×?×?."
+
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "×?×§×© ×?×©×¨×?×? ×?×?×¡×?×? ×?×?×©×?."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "×?×§×© ×?×©×¨×? IPv6."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "×?×§×© ×ª×¢×?×?×¨×? × ×ª×?×§×? ×¢\"×? TYPE."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "×§×?×? ×¢×?×ª×§ ×©×? ×?×¤×ª×? ×?-GPG ×?×¦×?×?×?×¨×? ×©×? BridgeDB."
diff --git a/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
index a8c72f0..650afd7 100644
--- a/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
@@ -5,21 +5,22 @@
 # Translators:
 # Ana B, 2013-2014
 # Armando Vega <synaan@xxxxxxxxx>, 2012
-# skiddiep <lyricaltumor@xxxxxxxxx>, 2014-2015
+# Igor <lyricaltumor@xxxxxxxxx>, 2016-2017
+# Igor <lyricaltumor@xxxxxxxxx>, 2014-2015
 # Tomislav SiroglaviÄ? <tomsiro@xxxxxxxxx>, 2014
 # gogo <trebelnik2@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-22 11:41+0000\n"
-"Last-Translator: skiddiep <lyricaltumor@xxxxxxxxx>\n"
-"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: Igor <lyricaltumor@xxxxxxxxx>\n"
+"Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -34,68 +35,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Oprostite! NeÅ¡to je poÅ¡lo po krivu s VaÅ¡im zahtjevom."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Prijavite greÅ¡ku"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Izvorni kod"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Zapisnik o promjenama"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Odaberi sve"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "PokaÅ¾i QR kod"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kod za VaÅ¡e linije mostova"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "O ne, greÅ¡ka!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju VaÅ¡eg QR koda."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ovaj QR kod sadrÅ¾i VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ?aje."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Trenutno nema dostupnih mostova..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "MoÅ¾da bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Korak %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Preuzmi %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Korak %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Preuzmi %s mostove %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Korak %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sad %s dodaj mostove u Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%samo mi daj mostove!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Napredne opcije"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "niÅ¡ta"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sD%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sP%sreuzmi mostove"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ovo je automatizirana poruka; molimo ne odgovarati.]"
+msgstr "[Ovo je automatizirana poruka; molimo ne odgovarajte na nju.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Ovdje su vaÅ¡i mostovi:"
+msgstr "Ovo su vaÅ¡i mostovi:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "PreÅ¡li ste limit. Molimo usporite! Minimum vremena izmeÄ?u emailova je %s sati. Svi daljnji emailovi tijekom ovog vremenskog perioda bit Ä?e ignorirani."
+msgstr "PreÅ¡li ste limit. Molimo usporite! Vremenski minimum izmeÄ?u emailova\nje %s sati. Svi daljnji emailovi tijekom ovog perioda Ä?e biti ignorirani."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (kombinirajte COMMANDs kako bi naznaÄ?ili viÅ¡e opcija istovremeno)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "DobrodoÅ¡li u BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podrÅ¾ani transport TYPEs:"
+msgstr "Trenutno podrÅ¾ani tipovi transporta:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Bok, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Bok, prijatelju!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Javni kljuÄ?evi"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s."
+msgstr "Ovaj email je sastavljen od duge, jednoroga i iskrica\nza %s na %s u %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,283 +229,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB nudi mostove s razliÄ?itim %stipovima Pluggable Transports%s\nkoji mogu pomoÄ?i prikriti VaÅ¡e veze s Tor mreÅ¾om, oteÅ¾avajuÄ?i onome tko\nprati VaÅ¡ internet promet da vidi da koristite Tor.\n"
+msgstr "BridgeDB nudi mostove s razliÄ?itim %stipovima prikljuÄ?nih transporta%s\nkoji mogu pomoÄ?i prikriti VaÅ¡e veze s Tor mreÅ¾om, oteÅ¾avajuÄ?i onome tko\nprati VaÅ¡ Internet promet da vidi da koristite Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Neki mostovi s IPv6 adresama su takoÄ?er dostupni, no neki Pluggable \nTransports nisu kompatibilni s IPv6.\n\n"
+msgstr "TakoÄ?er su dostupni neki mostovi s IPv6 adresama, no neki prikljuÄ?ni transporti nisu kompatibilni s IPv6.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nPluggable Transports %s koji moÅ¾da ne zvuÄ?e prezanimljivo, ali mogu\npomoÄ?i zaobiÄ?i internet cenzuru u mnogo sluÄ?ajeva.\n"
+msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji moÅ¾da ne zvuÄ?e prezanimljivo, ali mogu\npomoÄ?i zaobiÄ?i Internet cenzuru u mnogo sluÄ?ajeva.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Å to su mostovi?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Mostovi %s su Tor releji koji vam pomaÅ¾u zaobiÄ?i cenzuru."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Trebam alternativni naÄ?in dobivanja mostova!"
+msgstr "Trebam alternativni naÄ?in preuzimanja mostova!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "JoÅ¡ jedan naÄ?in za dobiti mostove je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih davatelja email usluge: %s %s ili %s."
+msgstr "JoÅ¡ jedan naÄ?in za preuzimanje mostova je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih davatelja email usluge: %s, %s ili %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Moji mostovi ne rade! Treba mi pomoÄ?!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ako vaÅ¡ Tor ne radi, poÅ¡aljite email na %s."
+msgstr "Ako VaÅ¡ Tor ne radi, poÅ¡aljite email na %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "PokuÅ¡ajte naznaÄ?iti Å¡to viÅ¡e informacija o vaÅ¡em sluÄ?aju, ukljuÄ?ujuÄ?i popis\nmostova i Pluggable Transports koje ste pokuÅ¡ali koristiti, verziju vaÅ¡eg Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
+msgstr "PokuÅ¡ajte ukljuÄ?iti Å¡to viÅ¡e informacija o svom sluÄ?aju, ukljuÄ?ujuÄ?i popis\nmostova i prikljuÄ?nih transporta koje ste pokuÅ¡ali koristiti, verziju svog Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Ovdje su linije vaÅ¡ih mostova:"
+msgstr "Ovo su linije vaÅ¡ih mostova:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Dobijte Mostove!"
+msgstr "Preuzmite mostove!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Molimo odaberite opcije za tip mosta:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Trebaju li vam IPv6 adrese?"
+msgstr "Trebaju li Vam IPv6 adrese?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trebate li %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "VaÅ¡ preglednik ne prikazuje slike ispravno."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Unesite znakove sa slike iznad..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Kako poÄ?eti koristite VaÅ¡e mostove"
+msgstr "Kako poÄ?eti koristite mostove"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Kad iskoÄ?i prozorÄ?iÄ? 'Tor MreÅ¾ne Postavke', kliknite 'Konfiguriraj' i slijedite\nÄ?arobnjaka dok ne upita:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Blokira li vaÅ¡ Internet Service Provider (ISP - pruÅ¾atelj internet usluge) ili ikako drugaÄ?ije cenzurira veze\ns Tor mreÅ¾om?"
+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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Odaberite 'Da', a zatim 'SljedeÄ?e'. Da bi konfigurirali vaÅ¡e 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 dugme 'PomoÄ?'\nu 'Tor MreÅ¾ne Postavke' Ä?arobnjaku za daljnju pomoÄ?."
+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Ä?."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Prikazuje ovu poruku."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "ZatraÅ¾i dobre, stare mostove."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "ZatraÅ¾i IPv6 mostove."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "ZatraÅ¾i Pluggable Transport po TYPE."
+msgstr "ZatraÅ¾i prikljuÄ?ni transport po tipu."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dobij kopiju BridgeDB javnog GnuPG kljuÄ?a."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Prijavi GreÅ¡ki"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Izvorni Kod"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Zapisnik o promjenama"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Odaberi Sve"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "PokaÅ¾i QR kod"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kod za VaÅ¡e linije mostova"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "O ne, greÅ¡ka!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju VaÅ¡eg QR koda."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ovaj QRKod sadrÅ¾i VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ?aje."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Trenutno nema dostupnih mostova..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "MoÅ¾da bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Korak %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Preuzmi %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Korak %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dobijte %s mostove %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Korak %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sad %s dodaj mostove u Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sS%samo mi daj mostove!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Napredne Opcije"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sD%sobij Bridges"
+msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG kljuÄ?a."
diff --git a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
index 6246b33..0b6d9fe 100644
--- a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Blackywantscookies <gaborcika@xxxxxxxxxxxx>, 2014
+# benewfy <benewfy@xxxxxxxxx>, 2015
+# Blackywantscookies, 2014
 # Lajos Pasztor <mrlajos@xxxxxxxxx>, 2014
-# Cerbo <taiurin@xxxxxxxxx>, 2014
-# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015
+# GergÅ? Felde <taiurin@xxxxxxxxx>, 2014
+# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015,2018
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 23:41+0000\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-12-28 15:07+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -34,57 +35,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "ElnÃ©zÃ©st! Valami rosszul mÅ±kÃ¶dÃ¶tt a kÃ©rÃ©sed kÃ¶zben."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Hiba jelentÃ©se"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ForrÃ¡s kÃ³d"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "VÃ¡ltozÃ¡sok"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Mindent kijelÃ¶l"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR KÃ³d megjelenÃtÃ©se"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR KÃ³d a hÃd sorokhoz"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "HoppÃ¡!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ã?gytÅ±nik a QR KÃ³d hibÃ¡s."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ez a QR KÃ³d a hÃd sorait tartalmazza. Olvassa be egy QR KÃ³d olvasÃ³val, hogy Ã¡tmÃ¡solja a HÃd sorokat mobil Ã©s egyÃ©b eszkÃ¶zeire."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Jelenleg nincsenek rendelkezÃ©sre Ã¡llÃ³ hidak..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "TalÃ¡n megprÃ³bÃ¡lhatnÃ¡l %s vissza menni %s Ã©s mÃ¡sik HÃd tÃpust vÃ¡lasztani."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "LÃ©pÃ©s %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "LetÃ¶ltÃ©s %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "LÃ©pÃ©s %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Hidak %s beszerzÃ©se"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "LÃ©pÃ©s %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor Browser-hez %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sC%ssak adjÃ¡l mÃ¡r nekem hidakat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "HaladÃ³ beÃ¡llÃtÃ¡sok"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nem"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Semmi"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%szeretnÃ©k!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sS%szerezni Bridge -et!"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ez egy automata levÃ©l, kÃ©rjÃ¼k ne vÃ¡laszoljon.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Itt vannak a hÃdjaid:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ã?n tÃºllÃ©pte a megadott mÃ©rtÃ©k hatÃ¡rt. KÃ©rÃ¼nk lassÃtson le! A minimum idÅ? email-ek kÃ¶zÃ¶tt\n%s Ã³ra. Minden tovÃ¡bbi emailt ez az idÅ? alatt elutasÃtunk."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (kombinÃ¡lja COMMANDs-okat hogy tÃ¶bbfÃ©le opciÃ³t adhasson meg egyszerre)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ã?dvÃ¶zÃ¶l a BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Jelenleg tÃ¡mogatott Ã¡tviteli tÃpusok: "
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "HÃ©, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hello!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "NyilvÃ¡nos kulcsok"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "Ez az email szivÃ¡rvÃ¡nyokkal, unikornisokkal, Ã©s ragyogÃ¡sokkal volt g
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,10 +229,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB hidakat tud bisztosÃtani szÃ¡mos %stÃpusÃ¡val a Pluggable Transports%s -nak\namely segÃti a kapcsolataidat Ã¶sszekeverni a Tor Network -ben,  ezzel sokkal\nnehezebbÃ© teszi akÃ¡rkinek hogy megnÃ©zze az internet forgalmadat Ã©s hogy meghatÃ¡rozzÃ¡k hogy Tor -t hasznÃ¡lsz.\n\n"
+msgstr "BridgeDB hidakat tud biztosÃtani szÃ¡mos %stÃpusÃ¡val a Pluggable Transports%s -nak\namely segÃti a kapcsolatait Ã¶sszekeverni a Tor Network-ben,  ezzel sokkal\nnehezebbÃ© teszi akÃ¡rkinek hogy megnÃ©zze az internet forgalmÃ¡t Ã©s hogy meghatÃ¡rozza hogy Tor-t hasznÃ¡l.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "NÃ©hÃ¡ny hÃd IPv6 cÃmekkel is elÃ©rhetÅ?, habÃ¡r nÃ©gÃ¡ny Pluggable\nT
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
 "\n"
 msgstr "Ezen felÃ¼l, BridgeDB -nek van sok rÃ©gi mÃ³di \"vanÃlia\"  hÃdjai %s melyek CsatlakoztathatÃ³ SzÃ¡llÃtÃ³k %s nÃ©lkÃ¼l vannak\nmely talÃ¡n nem hallatszik szuperÃ¼l, de Å?k mÃ©g mindig\ntudnak segÃteni kikerÃ¼lni az internet cenzÃºrÃ¡jÃ¡t.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Mik is a Hidak?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "A %s Hidak %s azok Tor relÃ©k, melyek segÃtik Ã¶nt a cenzÃºra elkerÃ¼lÃ©sÃ©ben."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "SzÃ¼ksÃ©gem van egy alternatÃv mÃ³dra a Hidak beszerzÃ©sÃ©hez!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,84 +274,84 @@ msgid ""
 "%s, %s or %s."
 msgstr "Egy mÃ¡sik mÃ³dja, hogy megkapd a bridge listÃ¡t kÃ¼ldj emailt a %s cÃmre. KÃ©rlek vedd figyelembe\naz emailt az alÃ¡bbi email szolgÃ¡ltatÃ³ cÃmekrÅ?l kÃ¼ldd:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor bÃ¶ngÃ©szÅ?d nem mÅ±kÃ¶dik, akkor kÃ¼ldj egy email-t %s."
+msgstr "Ha a Tor bÃ¶ngÃ©szÅ?je nem mÅ±kÃ¶dik, akkor kÃ¼ldjÃ¶n egy email-t %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "ProbÃ¡ljon minÃ©l tÃ¶bb informÃ¡ciÃ³t megadn amennyit csak tud, beleÃ©rtve a listÃ¡jÃ¡t \na %s hidaknak Ã©s Pluggable Transports -nak, amelyet hasznÃ¡lni prÃ³bÃ¡lt, A Tor Browser verziÃ³jÃ¡t,\nÃ©s minden Ã¼zenetet melyet Tor adott ki, stb."
+msgstr "PrÃ³bÃ¡ljon minÃ©l tÃ¶bb informÃ¡ciÃ³t megadni amennyit csak tud, beleÃ©rtve a listÃ¡jÃ¡t \na %s hidaknak Ã©s Pluggable Transports -nak, amelyet hasznÃ¡lni prÃ³bÃ¡lt, A Tor Browser verziÃ³jÃ¡t,\nÃ©s minden Ã¼zenetet melyet Tor adott ki, stb."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Itt vannak a hÃd soraid:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Hidak szerzÃ©se!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "KÃ©rem, vÃ¡lasszon opciÃ³t a hÃd tÃpushoz:"
+msgstr "KÃ©rjÃ¼k, vÃ¡lasszon opciÃ³t a hÃd tÃpushoz:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Kellenek Ã¶nnek IPv6 cÃmek?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "SzÃ¼ksÃ©ge van egy %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ez a bÃ¶ngÃ©szÅ? nem jelenÃti meg a kÃ©peket rendesen."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Adja meg a karaktereket amik a fenti kÃ©pen lÃ¡thatÃ³ak ..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Hogyan kezdjÃ¼k hasznÃ¡lni a hidat "
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "A hidak beÃ¡llÃtÃ¡sÃ¡hoz a Tor bÃ¶ngÃ©szÅ?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."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkolja vagy cenzÃºrÃ¡zza az Ã¶n internet szolgÃ¡ltatÃ³ja (ISP) a kapcsolatokat\na Tor hÃ¡lÃ³zatÃ¡hoz?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -233,153 +359,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "MegjelenÃti ezt az Ã¼tenetet."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Nem csatlakoztathatÃ³ szÃ¡llÃtÃ³ hÃd kÃ©relme."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPV6 hÃd kÃ©rÃ©se."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "MÃ¡solat szertÃ©se a BridgeDB's publikus GnuPG kulcsÃ¡bÃ³l."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Hiba jelentÃ©se"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ForrÃ¡s kÃ³d"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "VÃ¡ltozÃ¡sok"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Mindent kijelÃ¶l"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR KÃ³d megjelenÃtÃ©se"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR KÃ³d a hÃd sorokhoz"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "HoppÃ¡!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ã?gytÅ±nik a QR KÃ³d hibÃ¡s."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ez a QR KÃ³d a hÃd sorait tartalmazza. Olvassa be egy QR KÃ³d olvasÃ³val, hogy Ã¡tmÃ¡solja a HÃd sorokat mobil Ã©s egyÃ©b eszkÃ¶zeire."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Jelenleg nincsenek rendelkezÃ©sre Ã¡llÃ³ hidak..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "TalÃ¡n megprÃ³bÃ¡lhatnÃ¡l %s vissza menni %s Ã©s mÃ¡sik HÃd tÃpust vÃ¡lasztani."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "LÃ©pÃ©s %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "LetÃ¶ltÃ©s %s Tor BÃ¶ngÃ©szÅ? %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "LÃ©pÃ©s %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Hidak %s szertÃ©se"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "LÃ©pÃ©s %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Most %s a hidak hozzÃ¡adÃ¡sa a Tor BÃ¶ngÃ©szÅ?hÃ¶z %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sC%ssak adjÃ¡l mÃ¡r nekem hidakat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "HaladÃ³ beÃ¡llÃtÃ¡sok"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nem"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sS%szerezni Bridge -et!"
diff --git a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
index c16aeec..197ac30 100644
--- a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
@@ -3,27 +3,33 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Anthony Santana, 2014
-# Astryd Viandila Dahlan <astrydviandila@xxxxxxxxx>, 2015
+# anzhyo, 2014
+# Astryd Viandila Dahlan, 2015
 # cholif yulian <cholifyulian123@xxxxxxxxx>, 2015
 # constantius damar wicaksono <constantiusdamar@xxxxxxxxx>, 2015
-# Dwi Cahyono, 2015
+# Dwi Cahyono <dwexz_cie@xxxxxxxxx>, 2015
+# Ferriandy Chianiago <gpl4all@xxxxxxxxx>, 2015
+# ical, 2019
+# Lucas Susanto <susantolucas@xxxxxxxxx>, 2018
 # MasIs <is.roadster@xxxxxxxxx>, 2013
 # L1Nus <multazam_ali@xxxxxx>, 2014
+# Ngalim Siregar <ngalim.siregar@xxxxxxxxx>, 2015
 # km242saya <pencurimangga@xxxxxxxxx>, 2014
-# Zamani Karmana <zamani.karmana@xxxxxxxxx>, 2015
+# Wahyu Utomo Nurindrayanto <wahyutomo66@xxxxxxxxx>, 2016
+# Yerry Borang <yerry.borang@xxxxxxxxx>, 2019
+# zk, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-29 15:04+0000\n"
-"Last-Translator: Zamani Karmana <zamani.karmana@xxxxxxxxx>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-03-23 06:24+0000\n"
+"Last-Translator: Yerry Borang <yerry.borang@xxxxxxxxx>\n"
+"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -38,64 +44,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda."
+msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Laporkan bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kode Sumber"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Perubahan"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontak"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tampilkan QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode untuk bridge Anda"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ada masalah!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ada masalah saat mengambil QRCode Anda."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QRCode ini berisi jalur bridge Anda. Scan dengan pembaca QRCode untuk menyimpan jalur bridge Anda ke dalam perangkat mobile ataupun perangkat lainnya."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Belum ada bridge yang tersedia..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Langkah %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Unduh %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Langkah %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Dapatkan %s bridge %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Langkah %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%serikan saya bridge!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Pilihan Lebih Lanjut"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Tidak"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Tidak ada"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sD%sapatkan Jembatan!"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah pesan otomatis; tolong jangan dibalas.]"
+msgstr "[Ini adalah pesan otomatis; mohon untuk tidak dibalas.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Berikut jembatan Anda:"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Anda telah melampaui batas laju. Mohon perlambat! Waktu minimum antara\nsurel yaitu %s jam. Semua surel selanjutnya selama waktu periode ini akan diabaikan."
+msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda minimum antara\nsurel adalah %s jam. Semua surel lainnya selama waktu periode ini akan diabaikan."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "PERINTAH: (gabungkan PERINTAH untuk menetapkan beberapa opsi secara bersamaan)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Selamat datang di BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Saat ini mendukung transport TYPEs:"
+msgstr "Saat ini mendukung transport TYPE:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hai, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Halo, kawan!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Kunci Publik"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Surel ini dibuat dengan rainbow, unicorn, dan sparkle\nuntuk %s pada hari %s jam %s."
+msgstr "Surel ini dihasilkan dengan pelangi, unikorn, dan kilauan\nuntuk %s pada %s jam %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,10 +238,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stypes dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nbagi siapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
+msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -118,29 +253,29 @@ msgstr "Beberapa jembatan dengan alamat IPv6 juga tersedia, walaupun beberapa Pl
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Tambahan, BridgeDB mempunyai plain-ol'-vanilla bridges %s tanpa\nPluggable Transports %s yang mana mungkin tidak terdengar keren, tapi mereka masih dapat membantu untuk gangguan sensor internet di beberapa kasus .\n\n"
+msgstr "Sebagai tambahan, BridgeDB memiliki banyak jembatan biasa saja %s tanpa\nPluggable Transports %s yang mungkin tidak terdengar keren, tapi dalam banyak kasus\nmereka masih bisa membantu untuk menghindari sensor pada internet.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Apa itu jembatan?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor"
+msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +283,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Cara lain untuk mendapatkan Jembatan adalah dengan mengirimkan surel ke %s.\nMohon dicatat bahwa Anda harus mengirim surel menggunakan alamat dari\nsalah satu penyedia layanan surel berikut: %s, %s atau %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
@@ -161,225 +296,100 @@ msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Coba sertakan sebanyak mungkin info tentang kasus Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Peramban Tor Anda, dan pesan apapun yang diberikan oleh Tor, dll."
+msgstr "Coba sertakan sebanyak mungkin info tentang masalah Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Tor Browser Anda, dan pesan apapun yang diberikan oleh Tor, dll."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Berikut jembatan Anda:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Dapatkan Jembatan!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Mohon pilih opsi untuk tipe jembatan:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Apakah anda membutuhkan IP versi 6 ?"
+msgstr "Apakah Anda membutuhkan alamat IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Apakah anda membutuhkan %s?"
+msgstr "Apakah Anda membutuhkan %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Perambah anda tidak menampilkan gambar dengan tepat."
+msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Masukkan karakter dari gambar diatas..."
+msgstr "Masukkan karakter dari gambar di atas..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Bagaimana cara memulai menggunakan Bridges anda"
+msgstr "Cara memulai menggunakan jembatan Anda"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "untuk memasuki bridge ke dalam Browser Tor, pertama menuju %s Tor Browser download\npage %s dan kemudian ikuti instruksi disana untuk download and start\n Browser Tor."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "ketika muncul dialog  'Tor Network setting', klik 'Configure' dan ikuti\nwizard sampai meminta"
+msgstr "Ketika muncul dialog 'Pengaturan Jaringan Tor', klik 'Konfigurasi' dan ikuti\npenuntun sampai ia meminta:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Apakah penyedia layanan internet (ISP) anda menutup akses \nke jaringan Tor ?"
+msgstr "Apakah Penyedia Layanan Internet (ISP) Anda menutup akses atau menyensor\nkoneksi ke jaringan Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "pilih 'Yes' dan kemudian klik  'Next'. untuk  mengkonfigurasi bridges baru anda, copy dan\npaste jalur bridge kedalam box input teks. Akhirnya, click 'Connect', dan\nanda harus baik untuk go! jika anda mengalami kesulitan, coba klik tombol 'Help'\ndi wizard 'Tor Network Settings' bantuan lanjutan."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Tampilkan pesan ini"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "permintaan vanilla bridges"
+msgstr "Minta jembatan yang biasa."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "permintaan IPv6 bridges"
+msgstr "Minta jembatan IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "permintaan pluggable transport oleh TYPE"
+msgstr "Minta Pluggable Transport berdasarkan TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dapatkan copy dari BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Laporkan Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "kode sumber"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "daftar Perubahan"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontak"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Pilih Semua"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Perlihatkan KodeQR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode untuk  jalur bridge anda"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Waduh, ibu kos ngamuk!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Terlihat ada yang error dalam mendapatkan QRCode anda"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr " QRCode ini berisi jalur bridge anda. Scan dengan QRCode reader untuk meng- copy jalur bridge anda ke dalam  mobile dan perangkat lain"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Sekarang tidak tersedia bridges"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, 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 bridge yang berbeda"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Langkah %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Unduh %s Peramban Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Langkah %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dapatkan %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Langkah %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sekarang %s tambahkan bridges ke Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust berikan saya bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opsi Lanjutan"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Tidak"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "Dapatkan salinan kunci publik GnuPG BridgeDB."
diff --git a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
index bc2252b..10857dd 100644
--- a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
@@ -3,30 +3,37 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Alberto <alberto.pilato@xxxxxxxxx>, 2015
+# Alessandro Toffalini, 2017
+# DarkGreninja <leonardo.pantani@xxxxxxxxx>, 2017
 # fetidyoo <tru74368@xxxxxxxxx>, 2011
 # Francesca Ciceri <madamezou@xxxxxxxxxx>, 2014
 # HostFat <hostfat@xxxxxxxxx>, 2015
 # ironbishop <ironbishop@xxxxxxxx>, 2011
 # ironbishop <ironbishop@xxxxxxxx>, 2011
 # Jacob Appelbaum <jacob@xxxxxxxxxxxxx>, 2009
+# Leunam X1 <leunam.x1@xxxxxxxxx>, 2016
 # Luca Marzo <luca@xxxxxxxxxxxxxxxxxxx>, 2011
-# n0on3 <a.n0on3@xxxxxxxxx>, 2011
+# Matteo Anese <anese.matteo@xxxxxxxxx>, 2015
+# mattia_b89 <mattia.b89@xxxxxxxxx>, 2019
+# Alessandro Manfredi <a.n0on3@xxxxxxxxx>, 2011
 # Paolo Stivanin <paolostivanin@xxxxxxxxx>, 2014
 # Random_R, 2013
 # Random_R, 2013-2015
+# Sebastiano Pistore <SebastianoPistore.info@xxxxxxxxxxxxx>, 2018
 # fetidyoo <tru74368@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 17:23+0000\n"
-"Last-Translator: Random_R\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-13 09:03+0000\n"
+"Last-Translator: mattia_b89 <mattia.b89@xxxxxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -41,57 +48,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Siamo spiacenti ma qualcosa Ã¨ andato storto con la tua richiesta."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Segnala un Problema"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Codice sorgente"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "NovitÃ "
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contatti"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostra Codice QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Codice QR per le tue bridge lines"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Figo!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Sembra che ci sia stato un errore nell'ottenere il tuo QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore QR per copiare le tue linee ponte sul telefono cellulare o su altri dispositivi."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Non ci sono bridge disponibili al momento..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Scarica %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ottenere dei %s bridge %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%sammi i bridge e basta!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opzioni Avanzate"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nessuno"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sÃ¬!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sttieni Bridge"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Questo Ã¨ un messaggio automatico, si prega di non rispondere.]"
+msgstr "[Questo Ã¨ un messaggio inviato automaticamente, si prega di non rispondere.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ecco i tuoi bridge:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Hai superato il limite massimo. Per favore rallenta! Il tempo minimo tra le email\nÃ¨ di %s ore. Tutte le altre email durante questo periodo di tempo verranno ignorate."
+msgstr "Hai superato il limite massimo di email. Per favore rallenta! Il tempo minimo tra le email Ã¨ di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Benvenuto/a su BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Transport TYPEs attualmente supportati:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hey, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ciao amico!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -102,7 +234,7 @@ msgstr "Questa email Ã¨ stata generata con arcobaleni, unicorni e scintille\nper
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -113,7 +245,7 @@ msgid ""
 msgstr "BridgeDB puÃ² fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiÃ¹ difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -125,7 +257,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -134,20 +266,20 @@ msgid ""
 "\n"
 msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Cosa sono i bridge?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Mi serve un altro modo per avere dei bridge!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -155,12 +287,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Un altro modo di ottenere i bridge Ã¨ inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "I miei bridge non funzionano! Mi serve aiuto!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Se Tor non ti funziona, manda un'email a %s."
@@ -168,48 +300,48 @@ msgstr "Se Tor non ti funziona, manda un'email a %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Cerca di includere piÃ¹ informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ecco le tue linee bridge:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ottieni dei Bridge!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Seleziona le opzioni per il tipo di bridge:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ti servono indirizzi IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ti serve un %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Il tuo browser non mostra le immagini in modo corretto."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Inserisci i caratteri nell'immagine sopra..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Come iniziare a usare i tuoi bridge"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -218,21 +350,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -240,153 +372,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Mostra questo messaggio."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Richiedi bridge vanilla."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Richiedi bridge IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Segnala un Errore"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Codice Sorgente"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contatti"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostra QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode per le tue linee ponte"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Non ci sono bridge disponibili al momento..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Scarica %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ottenere dei %s bridge %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ora %s aggiungi i bridge a Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%sammi i bridge e basta!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opzioni Avanzate"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sttieni Bridge"
diff --git a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
index 8edd083..6979bb4 100644
--- a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
@@ -3,24 +3,26 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# 323484, 2018
 # brt <87@xxxxxxxxxxx>, 2013
 # ABE Tsunehiko, 2014-2015
-# ã?¿ã?«ã??ã?· <gomidori@xxxxxxx>, 2013
-# ã?¿ã?«ã??ã?· <gomidori@xxxxxxx>, 2014
+# azumukupoe, 2017
+# ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2013
+# ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2014
 # Masaki Saito <rezoolab@xxxxxxxxx>, 2013
 # è?¤å??ã??ç?² <m1440809437@xxxxxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-05-22 16:01+0000\n"
-"Last-Translator: ABE Tsunehiko\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -35,57 +37,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ã??ã??ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
+msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ã??ã?°ã??å ±å??ã??ã??"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "å¤?æ?´å±¥æ´"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ã??å??ã??å??ã??ã??"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ã??ã?¹ã?¦é?¸æ??"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR ã?³ã?¼ã??ã??è¡¨ç¤º"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?® QR ã?³ã?¼ã??"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "ã??ã?£ã?¨ã?¹ã??ã?²ã??ã??ã?£ï¼?"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR ã?³ã?¼ã??ã??ä½?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "ã??ã?® QR ã?³ã?¼ã??ã?¯ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??å?«ã?¿ã?¾ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ã??ã??ã??ã?? ã?? %s æ?»ã?£ã?¦ %s ç?°ã?ªã??ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã?¿ã??ã?¹ã??ã?§ã??ã??ã??ã??"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ã?¹ã??ã??ã?? %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ã?¹ã??ã??ã?? %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ã?¹ã??ã??ã?? %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "é«?åº¦ã?ªè¨å®?"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ã??ã??ã??"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ã?ªã??"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sã?¯%sã??ï¼?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[ã??ã?®ã?¡ã?¼ã?«ã?¯è?ªå??é??ä¿¡ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?§ã??ã??è¿?ä¿¡ã??ã?ªã??ã?§ã??ã? ã??ã??ã??]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?¯ã??ã?¡ã??:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "ã?¬ã?¼ã??å?¶é??ã??è¶?é??ã??ã?¾ã??ã??ã??ã?¡ã?¼ã?«é??ã?®æ??å°?æ??é??ã?¯ %s æ??é??ã?§ã??ã??ã??ã?®æ??é??ä¸ã?«ã??ã??ã?«é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?¯å?¨ã?¦ç?¡è¦?ã??ã??ã?¾ã??ã??"
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "ã?³ã??ã?³ã??: (ã?³ã??ã?³ã??ã??çµ?ã?¿å??ã??ã??ã?¦ã??å??æ??ã?«è¤?æ?°ã?®ã?ªã??ã?·ã?§ã?³ã??æ??å®?ã??ã??)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB ã?¸ã??ã??ã??ã??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "ç?¾å?¨ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã??:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "ã?©ã??ã?? %s ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "ã?©ã??ã??ã??ã??ã??ã?«ã?¡ã?¯ï¼?"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "å?¬é??é?µ"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +223,7 @@ msgstr "ã??ã?®ã?¡ã?¼ã?«ã?¯ %s ã?« %s %s ã?« rainbow å??ã?³ unicorn ã?? sparkle 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,7 +234,7 @@ msgid ""
 msgstr "BridgeDB ã?¯ã??%sã?¿ã?¤ã??ã?® Pluggable Transports%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nTor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??æ??ã??ã??ã?¥ã??ã??ã??ã??ã??ã?¨ã?«å½¹ç«?ã?¡ã??ã??ã?ªã??ã?®\nã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??èª°ã??ã??ã??ã?ªã??ã?? Tor ã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã?ªã??ã?¾ã??ã??\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -119,7 +246,7 @@ msgstr "IPv6 ã?®ã?¢ã??ã?¬ã?¹ã?®ã??ã?ªã??ã?¸ã??å?©ç?¨ã?§ã??ã??ã??ã?®ã??ã??ã??ã?¾
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -128,20 +255,20 @@ msgid ""
 "\n"
 msgstr "å? ã??ã?¦ã??  BridgeDB ã?¯ã?? %s Pluggable Transport %s ã?®ã?ªã??å¤?ã??ã?®ä½?ã?®å¤?å?²ã??ã?ªã??\né??å¸¸ã?®ã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã?¯ã?¼ã?«ã?«ã?¯æ??ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã??ã??å¤?ã??ã?®å ´å??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s ã??ã?ªã??ã?¸ %s ã?¯ã?? ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??å?©ã??ã?¨ã?ªã?? Tor ã?ªã?¬ã?¼ã?§ã??ã??"
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +276,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®ã??ã??æ?¹ã?¯ %s ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??\nä»¥ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??:\n %s ã?? %s ã?¾ã??ã?¯ %s"
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??ã??"
@@ -162,48 +289,48 @@ msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "ã??ã?ªã??ã??ä½¿ã??ã??ã?¨ã??ã??ã??ã?ªã??ã?¸ã?? Pluggable Transports ã?? ã??å?©ç?¨ã?® Tor Browser ã??ã?¼ã?¸ã?§ã?³ã??ã??ã??ã?¦ Tor ã??å?ºå??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ç?ã?ªã?©ã??å?«ã?¿ã??å?ºæ?¥ã??é??ã??ã??ã?ªã??ã?®ã?±ã?¼ã?¹ã?«é?¢ã??ã??å¤?ã??ã?®æ??å ±ã??å?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?¯ã??ã?¡ã??ã?§ã??:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??è¡¨ç¤ºã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,175 +339,50 @@ msgid ""
 msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??è¦§ã??ã? ã??ã??ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ã??å?©ç?¨ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã?ªã??ã??\nå?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã??ã??ã?«ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??\nã??ã??æº?å??ã??å?ºæ?¥ã??ã?¯ã??ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«ã??Tor\nã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
+msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã??ã??ã?«ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??\nã??ã??æº?å??ã??å?ºæ?¥ã??ã?¯ã??ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«\nã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "ã??ã?®ç?»å??ã??è¡¨ç¤º"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "vanilla ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ã?¿ã?¤ã??ã??ã?¨ã?« Pluggable Transport ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB ã?® GnuPG å?¬é??é?µã?®ã?³ã??ã?¼ã??æ??ã?«å?¥ã??ã?¾ã??ã??ã??ã??"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ã??ã?°ã??å ±å??ã??ã??"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "å¤?æ?´å±¥æ´"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ã??å??ã??å??ã??ã??"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ã??ã?¹ã?¦é?¸æ??"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR ã?³ã?¼ã??ã??è¡¨ç¤º"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?® QR ã?³ã?¼ã??"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "ã??ã?£ã?¨ã?¹ã??ã?²ã??ã??ã?£ï¼?"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "QR ã?³ã?¼ã??ã??ä½?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "ã??ã?® QR ã?³ã?¼ã??ã?¯ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??å?«ã?¿ã?¾ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "ã??ã??ã??ã?? ã?? %s æ?»ã?£ã?¦ %s ç?°ã?ªã??ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã?¿ã??ã?¹ã??ã?§ã??ã??ã??ã??"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ã?¹ã??ã??ã?? %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ã?¹ã??ã??ã?? %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ã?¹ã??ã??ã?? %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "é«?åº¦ã?ªè¨å®?"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ã??ã??ã??"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sã?¯%sã??ï¼?"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
diff --git a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
index e877b87..2ab52d3 100644
--- a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
@@ -1,104 +1,398 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
 # ilbe123 <a3057016@xxxxxxxxx>, 2014
+# Chris Park <utopinator@xxxxxxxxx>, 2016
+# snotree <cknblue@xxxxxxxxx>, 2017
 # cwt96 <cwt967@xxxxxxxxx>, 2012
-# Dr.what <javrick6@xxxxxxxxx>, 2014
-# pCsOrI <pcsori@xxxxxxxxx>, 2012
+# ê³ ì??ì?± <greenknite@xxxxxxxxx>, 2015
+# Hyuntae Chun, 2017
+# Oliver Lee <imsesaok@xxxxxxx>, 2018
+# Jamin <bakzaa@xxxxxxxxx>, 2014
+# Dr.what <javrick6@xxxxxxxxx>, 2014-2015
+# Gu Hong Min <placidmoon1@xxxxxxxxx>, 2015
+# ë¥?ì¢?í??, 2015
+# Myeongjin <aranet100@xxxxxxxxx>, 2016
+# Oliver Lee <imsesaok@xxxxxxx>, 2019
+# ì?´í?¼ì??ì??ë¦¬ <pcsori@xxxxxxxxx>, 2012
+# Philipp Sauter <qt123@xxxxx>, 2018
+# Sam Ryoo <samryoo@xxxxxxxxx>, 2014
+# Sangmin Lee <sangminlee7648@xxxxxxxxx>, 2016
+# Revi_, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-05-06 06:40+0000\n"
-"Last-Translator: ilbe123 <a3057016@xxxxxxxxx>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-10 07:57+0000\n"
+"Last-Translator: Oliver Lee <imsesaok@xxxxxxx>\n"
+"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? ë¬´ì?¸ê°? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ë²?ê·¸ë¥¼ ë³´ê³ í??ê¸°"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ì??ì?¤ ì½?ë??"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "ë³?ê²½ ê¸°ë¡?"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ì?°ë?½í??ê¸°"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ëª¨ë?? ì? í??"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRì½?ë?? ë³´ê¸°"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "ë¸?ë¦¿ì§? ì?  QRì½?ë??"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "ì?´ë¨¸ë??, ë?ê°? ì??ëª»ë??ì??ì?µë??ë?¤!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR ì½?ë??ë¥¼ ë¶?ë?¬ ì?¤ë?? ì¤? ì?¤ë¥?ê°? ì??ê¸´ ê²? ê°?ì?µë??ë?¤."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "ì?´ QRì½?ë??ë?? ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ì?? í?¬í?¨í??ê³  ì??ì?µë??ë?¤. ë¸?ë¦¿ì§? í??ì?? ë?¤ë¥¸ ê¸°ê¸°ë¡? ë³µì?¬í??ë ¤ë©´ QRì½?ë?? ë¦¬ë??ë¡? ì?¤ìº?í??ì?¸ì??."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "í??ì?¬ ì?¬ì?©í?  ì?? ì??ë?? ë¸?ë¦¿ì§?ê°? ì??ì?µë??ë?¤..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "%s ë??ë??ì??ê°?ì?? %s ë?¤ë¥¸ ë¸?ë¦¿ì§? í??ì??ë?? ê³¨ë?¼ë³´ì?¸ì??!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%së?¨ê³? "
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor ë¸?ë?¼ì?°ì ? %së¥¼ ë?¤ì?´ë°?ì?µë??ë?¤ "
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%së?¨ê³? "
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s ë¸?ë¦¿ì§? %së¥¼ ê°?ì ¸ì?µë??ë?¤"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%së?¨ê³? "
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ì?´ì ? %s ë¸?ë¦¿ì§?ë¥¼ Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sê·¸%së?¥ ë¸?ë¦¿ì§? ì£¼ì?¸ì??!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "ê³ ê¸? ì?µì??"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ì??ë??ì?¤"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ì??ì??"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%së?¤!%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%së¸?%së¦¿ì§? ì?»ê¸°"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[ì?´ê²?ì?? ì??ë??ì?¼ë¡? ì??ì?±ë?? ë©?ì??ì§?ì??ë??ë?¤; í??ì? í??ì§? ë§?ì?ì??ì?¤.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§?ë?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
+
+#: bridgedb/strings.py:47
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "ì??ë?? ì ?í??ì?? ì´?ê³¼í??ì??ì?µë??ë?¤. ì??ë??ë¥¼ ë?®ì¶?ì?¸ì??! ì?´ë©?ì?¼ ê°?ì?? ìµ?ì?? ê°?ê²©ì??\n%s ì??ê°?ì??ë??ë?¤. ì?´ ê¸°ê°? ë??ì??ì?? ì¶?ê°?ì ?ì?¸ ëª¨ë?  ì?´ë©?ì?¼ì?? ë¬´ì??ë?  ê²?ì??ë??ë?¤."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (COMMANDsë¥¼ ì??ì?´ì?? ì?¬ë?¬ ì?µì??ì?? ë??ì??ì?? êµ¬ì²´í?? í??ì?¸ì??)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "BridgeDB ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "ì§?ì??ì?´ ë??ë?? transport TYPEs"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "ì ?ê¸°, %sì?¼! "
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "ì??ë?? ì¹?êµ¬!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "ê³µê°? í?¤"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "ì?´ ì?´ë©?ì?¼ì?? %sì??ê²? %sì?? %sì??ì??\në¬´ì§?ê°?, ì? ë??ì½? ê·¸ë¦¬ê³  ë°?ì§?ì?´ë¡? ì??ì?±ë??ì??ì?µë??ë?¤."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB ë?? ì?¬ë?¬ ì¢?ë¥?ì?? %sì?½ì??í?? ì?¥ì¹?%s ì??ì?? ë¸?ë¦¿ì§?ë¥¼ ì ?ê³µí?©ë??ë?¤.\nì?´ê²?ì?? Tor ë?¤í?¸ì??í?¬ì??ì?? ì?°ê²°ì?? ë??ë??í?? ì??í?¤ë©° ë??êµ°ê°? ì?¸í?°ë?· í?¸ë??í?½ì??\nê°?ì??í??ë?? ì?¬ë??ì?´ ë?¹ì? ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ì?¬ì?©í??ê³  ì??ë?¤ë?? ê²?ì?? ì??ë³?í??ê¸° ì?´ë µê²? í?©ë??ë?¤.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "ëª?ëª? ë¸?ë¦¬ì§?ë?? IPv6 ì£¼ì??ë?? ì§?ì??í??ë??,\nPluggable Transportsë?? IPv6ë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "ê±°ê¸°ë?¤, BridgeDBë?? %s Pluggable Transportê°? ì??ë?? %s\ní??í?´ë¹ ì§? ë¸?ë¦¿ì§?ë?¤ë?? ë§?ì??ì??. ë??ë?¨í?? ì??ë¦¬ê°?ì§? ì??ê² ì§?ë§?,\nê·¸ë??ë?? ì?¬ë?¬ ëª¨ë¡? ì?¸í?°ë?· ê²?ì?´ ì?°í??ë¥¼ ë??ì??ì¤?ë??ë?¤.\n\n"
+
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "'ë¸?ë¦¿ì§?'ë???"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
 #, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "ì¤?ê³? ì??ë²? ë¸?ë¦¿ì§? %s ì¤?ì??ì??, %s ê°? ì?¬ë?¬ë¶?ì?? ê²?ì?´ ì?°í??ë¥¼ ë??ì??ì¤? ì?? ì??ë?? Tor ì¤?ê³? ì??ë²? ì??ë??ë?¤."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %së?? ë?¹ì? ì?´ ê²?ì?´ì?? í?¼í? ì?? ì??ê²? í??ë?? Tor ë¦´ë ?ì?´ì??ë??ë?¤. "
 
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
 
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "ê³µê°?ë?? ë¸?ë¦¿ì§? ì£¼ì??ë¥¼ ì°¾ì?? ë??, í?µì? ì? ì?? 'get brides'ë?¼ê³  ì?´ë©?ì?¼ì?? ì ?ì?´ì?? ë³´ë?´ë?? ë°©ë²?ë?? ì??ì?µë??ë?¤.(ë©?ì?¼ì?? ë³´ë?´ë?? ì?¬ë??ì?? ì£¼ì?? í??ê¸°ë?? from %s ë??ë?? %s ì£¼ì??)"
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?? ì?? ì??ë?? ë?¤ë¥¸ ë°©ë²?ì?? %s ë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì??ë?? ê²?ì??ë??ë?¤.\nì?´ ì?´ë©?ì?¼ ì??ë¹?ì?¤ë¥¼ í?µí?´ì?? ë³´ë?´ì??ì?¼ í??ë?¤ë?? ê²?ì?? ëª?ì?¬í?´ ì£¼ì?¸ì?? :\n%s, %s, %s"
 
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "ë¸?ë¦¿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
 #, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "ê·?í??ì?? í? ë¥´ê°? ì??ë??í??ì§? ì??ë??ë?¤ë©´, %sì?? ì?´ë©?ì?¼ì?? ë³´ë?´ì??ì?¼ í?©ë??ë?¤. ê°?ë?¥í?? í?? ë§?ì?? ì ?ë³´ë¥¼ í?¬í?¨í?´ì?? ë³´ë?´ì£¼ì?¸ì??. ì??ë¥¼ ë?¤ë©´ ê·?í??ê°? ì?¬ì?©í?? ë¸?ë¦¿ì§?ì?? ëª©ë¡?, ê·?í??ê°? ì?¬ì?©í??ë?? ë²?ë?¤ì?? í??ì?¼ ì?´ë¦?ê³¼ ë²?ì ?, ê·?í??ì?? í? ë¥´ê°? ë§? ê°?ì?? ë?? ë??ì?¨ ë©?ì?¸ì§?. ì?´ ì?¸ì??ë?? ì ?ì?? ì?? ì??ë?? ì?¬ë?¬ ê°?ì§?."
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "ë§?ì?½ Torê°? ì??ë??í??ì§? ì??ì?¼ë©´, %së¡? ì?´ë©?ì?¼ì?? ë³´ë?´ ì£¼ì?¸ì??. "
 
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "ì?? í?µì? ì? ì?? ì?¬ì?©í??ì??ë ¤ë©´ 'Vidalia's Network settings'-ë¹?ë?¬ë¦¬ì?? ë?¤í?¸ì??í?¬ ì?¤ì ?-í??ì?´ì§?ì?? ë?¤ì?´ê°? í??, 'My ISP blocks connections to the Tor network'-Tor ë?¤í?¸ì??í?¬ì?? ë?´ ISP ì?°ê²°ì?? ì°¨ë?¨-ì?? í?´ë¦í?©ë??ë?¤. ê·¸ë?¬ë©´ í??ë²?ì?? ê°?ê°?ì?? ë¸?ë¦¿ì§? ì£¼ì??ë¥¼ ì¶?ê°? í?  ì?? ì??ì?µë??ë?¤."
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "ê°?ë?¥í?? í?? ë§?ì?? ì ?ë³´ë¥¼ í?¬í?¨í?´ì£¼ì?¸ì??.\nì??ë¥¼ ë?¤ì?´ ë¸?ë¦¿ì§? ëª©ë¡? ë°? ì?¬ì?©í??ë ¤ë?? Pluggable Transport,\nTor ë¸?ë?¼ì?°ì ? ë²?ì ?, Torê°? ì¤? ë©?ì??ì§? ë?±."
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "í??ì?¬ ì?´ì?© ê°?ë?¥í?? ë¸?ë¦¿ì§? ì??ì??"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "ë?¹ì? ì?? ë¸?ë¦¿ì§? í??ë?¤ì?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ë¥¼ í??ì?´ì?´í?ì?¤ë¡? ì??ê·¸ë ?ì?´ë?? í??ì?¸ì??!"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?¼ì?¸ì??!"
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "ë??ê°?ì?? ë?¨ì?´ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "ë¸?ë¦¿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? ê³¨ë?¼ ì£¼ì?¸ì??:"
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1ë?¨ê³?"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "IPv6 ì£¼ì??ê°? í??ì??í?©ë??ê¹??"
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Tor %s Browser Bundle %së¥¼ ì??ì??"
+msgid "Do you need a %s?"
+msgstr "%s ê°? í??ì??í?©ë??ê¹??"
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2ë?¨ê³?"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? ëª»í?©ë??ë?¤."
 
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s ë¸?ë¦¿ì§? %së¥¼ ì??ì??"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "ì?? ê·¸ë¦¼ì?? ë¬¸ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤..."
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3ë?¨ê³?"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?¬ì?©í??ë?? ë°©ë²?"
 
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ê³§ ë°?ë¡? %s Tor ë¸?ë¦¬ì§?ë¥¼ ì¶?ê°? %s"
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?ë¦¬ì§?ë¥¼ ì??ë ¥í??ë ¤ë©´ ë¨¼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?ì¹¨ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë??í??ì°½ì?´ ë?¨ë©´, 'ì?¤ì ?'ì?? í?´ë¦í??ê³  ì??ë?? ì§?ë¬¸ì?´ ë??ì?¬ë??ê¹?ì§?\në§?ë²?ì?¬ë¥¼ ë?°ë?¼ì£¼ì?¸ì??:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "ë?¹ì? ì?? ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨ ë??ë?? ê²?ì?´í??ë??ì???"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??ë¥´ì?  í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ ì£¼ì?¸ì??.\në¸?ë¦¿ì§?ë¥¼ ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì?  ë¸?ë¦¿ì§?ë¥¼ í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì?  ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'ë¥¼ ë??ë?¬ ì£¼ì??ë©´ ì??ë??ë?  ê²?ì??ë??ë?¤!\në§?ì?½ ë¬¸ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "ì?´ ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤."
+
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "ì?¼ë°? ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "IPv6 ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "ì?½ì??í?? ì?¥ì¹?ë¥¼ TYPEë¥¼ í?µí?´ì?? ì??ì²í??ì?¸ì??."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "BridgeDBì?? ê³µê°? GnuPG í?¤ë¥¼ ì?»ì?µë??ë?¤."
diff --git a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
index 1e1366b..a1ccaa5 100644
--- a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,21 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>, 2012
-# OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>, 2013-2015
+# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012
+# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2013-2015
 # ThePirateDuck <thepirateduck.w@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-20 10:46+0000\n"
-"Last-Translator: OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
@@ -32,57 +32,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Atvainojiet! Notikusi ar JÅ«su pieprasÄ«jumu saistÄ«ta kÄ¼Å«me."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ZiÅ?ot par kÄ¼Å«du"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Pirmkods"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "IzmaiÅ?u Å¾urnÄ?ls"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "SazinÄ?ties"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "AtlasÄ«t visu"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ParÄ?dÄ«t QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode JÅ«su tiltu rindÄ?m"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ak, man' dieniÅ?!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "SÄ·iet, ka, saÅ?emot JÅ«su QRCode, notika kÄ¼Å«da."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ?jiet to ar QRCode lasÄ«tÄ?ju, lai iekopÄ?tu JÅ«su tiltu rindas mobilajÄ? tÄ?lrunÄ« un citÄ?s iekÄ?rtÄ?s."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Å obrÄ«d nav pieejamu tiltu..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "IespÄ?jams, ka Jums jÄ?mÄ?Ä£ina %s atgriezties %s un izvÄ?lÄ?ties citu tiltu veidu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Solis %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "LejuplÄ?dÄ?t %s PÄ?rlÅ«ku Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Solis %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "SaÅ?emt %s tiltus %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Solis %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%sikai dodiet man tiltus!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "LietpratÄ?ju opcijas "
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "NÄ?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nekas"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sÄ?!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sS%saÅ?emt tiltus"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Å is ir automÄ?tisks ziÅ?ojums; lÅ«dzu neatbildiet.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Te ir JÅ«su tilti:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "JÅ«s esat pÄ?rsniedzis pÄ?rraides normu. LÅ«dzu, lÄ?nÄ?k. MinimÄ?lais laika ilgums starp\ne-pastiem ir %s stundas. Å ajÄ? laika posmÄ? visi turpmÄ?kie e-pasti tiks ignorÄ?ti."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (apvienot KOMANDA's, lai vienlaicÄ«gi norÄ?dÄ«tu daÅ¾Ä?das opcijas)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "SveicinÄ?ti BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Å obrÄ«d atbalstÄ«tie transporta VEIDI:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hei, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Sveiks, draug!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "PubliskÄ?s atslÄ?gas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\npriekÅ¡
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +229,7 @@ msgid ""
 msgstr "BridgeDB var nodroÅ¡inÄ?t tiltus ar daÅ¾Ä?diem %stypes Pluggable Transports%s,\nkas var palÄ«dzÄ?t maskÄ?t JÅ«su savienojumu ar Tor Network, tÄ?dÄ?jÄ?di padarot sareÅ¾Ä£Ä«tÄ?k ikvienam, kas seko JÅ«su interneta datu plÅ«smai, noteikt, ka lietojat Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -116,7 +241,7 @@ msgstr "Ir pieejami daÅ¾i tilti ar IPv6 adresÄ?m; tanÄ« pat laikÄ? daÅ¾i Pluggab
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +250,20 @@ msgid ""
 "\n"
 msgstr "TurklÄ?t BridgeDB ir pietiekami daudz parastu, vienkÄ?rÅ¡u tiltu %s bez jebkÄ?diem\nPluggable Transports %s, kas iespÄ?jams neizklausÄ?s tik inÄ?Ä«gi, bet arÄ« tie var\ndaudzos gadÄ«jumos palÄ«dzÄ?t apiet interneta cenzÅ«ru.\n \n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Kas ir tilti?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Tilti %s ir Tor retranslatori, kas palÄ«dz Jums apiet cenzÅ«ru."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Man nepiecieÅ¡ams alternatÄ«vs tiltu iegÅ«Å¡anas veids!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +271,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "VÄ?lviens veids kÄ? saÅ?emt tiltus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ?rojiet, ka e-pasts ir\njÄ?nosÅ«ta no viena no sekojoÅ¡ajiem e-pasta pakalpojumu sniedzÄ?jiem:\n%s, %s vai %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ja JÅ«su Tor nestrÄ?dÄ?, Jums jÄ?nosÅ«ta e-pasts %s."
@@ -159,48 +284,48 @@ msgstr "Ja JÅ«su Tor nestrÄ?dÄ?, Jums jÄ?nosÅ«ta e-pasts %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Centieties iekÄ¼aut pÄ?c iespÄ?jas daudz informÄ?ciju par savu situÄ?ciju, tostarp pievienojot to tiltu un Pluggable Transports sarakstu, kurus centÄ?ties izmantot, savu Tor Browser versiju un visus Tor ziÅ?ojumus, un citu lÄ«dzÄ«gu informÄ?ciju."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Te ir JÅ«su tiltu lÄ«nijas:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "SaÅ?emt Tiltus!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Vai ir nepiecieÅ¡amas IPv6 adreses?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Vai ir nepiecieÅ¡ams %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "KÄ? sÄ?kt izmantot JÅ«su tiltus"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +334,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Vai JÅ«su Interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai citÄ?dÄ? veidÄ? cenzÄ? savienojumus\nar tÄ«klu Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -231,153 +356,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\"."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "RÄ?da ziÅ?ojumu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "PieprasÄ«t parastos tiltus."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "PieprasÄ«t IPv6 tiltus."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "SaÅ?emt BridgeDB publiskÄ?s GnuPG atslÄ?gas kopiju."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ZiÅ?ot par kÄ¼Å«du"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Pirmkods"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "IzmaiÅ?u Å¾urnÄ?ls"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "SazinÄ?ties"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "AtlasÄ«t visu"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "ParÄ?dÄ«t QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode JÅ«su tiltu rindÄ?m"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ak, man' dieniÅ?!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "SÄ·iet, ka, saÅ?emot JÅ«su QRCode, notika kÄ¼Å«da."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ?jiet to ar QRCode lasÄ«tÄ?ju, lai iekopÄ?tu JÅ«su tiltu rindas mobilajÄ? tÄ?lrunÄ« un citÄ?s iekÄ?rtÄ?s."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Å obrÄ«d nav pieejamu tiltu..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "IespÄ?jams, ka Jums jÄ?mÄ?Ä£ina %s atgriezties %s un izvÄ?lÄ?ties citu tiltu veidu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Solis %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "LejuplÄ?dÄ?t %s PÄ?rlÅ«ku Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Solis %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "SaÅ?emt %s tiltus %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Solis %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sT%sikai dodiet man tiltus!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "LietpratÄ?ju opcijas "
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "NÄ?"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sS%saÅ?emt tiltus"
diff --git a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
index d509e3c..3b33515 100644
--- a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,383 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
-# VHR <viktor.hr@xxxxxxxxx>, 2014
+# Cacko Cackoas <cackothe@xxxxxxxxx>, 2015
+# Viktor Hristov, 2014
+# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-12 22:21+0000\n"
-"Last-Translator: VHR <viktor.hr@xxxxxxxxx>\n"
-"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-11-06 01:52+0000\n"
+"Last-Translator: Zarko Gjurov <zarkogjurov@xxxxxxxxx>\n"
+"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "Ð¨Ñ?Ð¾ Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°?"
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "Ð?Ð·Ð²Ð¸Ð½ÐµÑ?Ðµ! Ð¡Ðµ Ñ?Ð»Ñ?Ñ?Ð¸ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð¾ Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð±Ð°Ñ?Ð°Ñ?Ðµ."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð?Ð·Ð²Ð¾Ñ?ÐµÐ½ ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ð?Ð¾Ð³ Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ð?Ð´Ð±ÐµÑ?Ð¸ Ñ?Ðµ"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ QR ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ð?ÐµÐ»Ðµ Ð¼Ð°Ñ?ÐºÐ¾!"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð?Ð¼Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð´Ð¾Ð±Ð¸Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? QR ÐºÐ¾Ð´."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ð?Ð²Ð¾Ñ? QR ÐºÐ¾Ð´ Ð³Ð¸ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ? Ð³Ð¾ Ñ?Ð¾ QR ÐºÐ¾Ð´ Ñ?Ð¸Ñ?Ð°Ñ? Ñ?.Ðµ. Ñ?Ð¾ ÐºÐ°Ð¼ÐµÑ?Ð°Ñ?Ð° Ð·Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸ Ð½Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð¼Ð¾Ð±Ð¸Ð»ÐµÐ½ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ Ð¸Ð»Ð¸ Ð´Ñ?Ñ?Ð³ Ñ?Ñ?ÐµÐ´."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸..."
+
+#: bridgedb/https/templates/bridges.html:132
 #, python-format
 msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ñ?ÐµÐ»ÐµÐ¸ Ð·Ð° Ð?Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° %s Ñ?Ðµ Tor Ñ?ÐµÐ»ÐµÐ¸ ÐºÐ¾Ð¸ Ñ?Ð¸ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð°Ñ? Ð´Ð° Ð³Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ð¸Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ð¾."
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ð?Ð¾Ð¶ÐµÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ðµ %s Ð²Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð°Ð·Ð°Ð´ %s Ð¸ Ð¸Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³ Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?!"
 
-#: lib/bridgedb/templates/base.html:39
-msgid "I need an alternative way of getting bridges!"
-msgstr "Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ð¼ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°!"
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ð§ÐµÐºÐ¾Ñ? %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ð§ÐµÐºÐ¾Ñ? %s2%s"
 
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ð§ÐµÐºÐ¾Ñ? %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ð´Ð¸ Ð³Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ð²Ð¾ Tor Browser%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð´Ð°Ñ? Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ð¸!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¸ Ð¾Ð¿Ñ?Ð¸Ð¸"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ð?Ðµ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð½Ð¸Ñ?Ñ?Ð¾"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ?%sÐ°! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸."
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ?%sÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Ð?Ð²Ð° Ðµ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ð°ÐºÐ°; Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð½Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ñ?Ðµ.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸:"
+
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ñ?Ðµ Ð½Ð°Ñ?Ð´Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ð°Ð²Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð°Ñ?Ð¸ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° (Ð¾Ð´ %s Ð¸Ð»Ð¸ %s Ð°Ð´Ñ?ÐµÑ?Ð°) Ð½Ð° %s Ñ?Ð¾ Ñ?ÐµÐºÑ?Ñ? 'get bridges' Ð²Ð¾ Ñ?Ð¾Ð´Ñ?Ð¶Ð¸Ð½Ð°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°."
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Ð?Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½Ð°Ð²Ñ?Ðµ Ñ?Ñ?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð½Ð° Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ð°. Ð?Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ð´ Ð·Ð°Ð¿Ñ?ÐµÑ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ñ?Ð¼ Ð²Ñ?ÐµÐ¼ÐµÑ?Ð¾ Ð¿Ð¾Ð¼ÐµÑ?Ñ?\nÐµ-Ð¿Ð¾Ñ?Ð°ÐºÐ¸Ñ?Ðµ Ðµ %s Ñ?Ð°Ñ?Ð¾Ð²Ð¸. Ð¡Ð¸Ñ?Ðµ Ð¿Ð¾Ð½Ð°Ñ?Ð°Ð¼Ð¾Ñ?Ð½Ð¸ Ðµ-Ð¿Ð¾Ñ?Ð°ÐºÐ¸ Ð²Ð¾ Ð¾Ð²Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸ Ð¿ÐµÑ?Ð¸Ð¾Ð´ Ñ?Ðµ Ð±Ð¸Ð´Ð°Ñ? Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: lib/bridgedb/templates/base.html:48
-msgid "My bridges don't work! I need help!"
-msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð¿Ð¾Ð¼Ð¾Ñ?!"
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð´Ð° Ð¿Ð¾Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð¸Ñ?Ñ?Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾)"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "Ð?Ð¾Ð±Ñ?ÐµÐ´Ð¾Ñ?Ð´Ð¾Ð²Ñ?Ðµ Ð²Ð¾ BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð¢Ð?Ð?Ð?Ð?Ð? Ð½Ð° Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ»Ñ?!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¸"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ð?ÐºÐ¾ Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Tor Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°, Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s. Ð?Ñ?Ð¾Ð±Ð°Ñ? Ð´Ð° Ð²Ð½ÐµÑ?ÐµÑ? ÐºÐ¾Ð»ÐºÑ? Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ð¸ Ð»Ð¸Ñ?Ñ?Ð° Ð¾Ð´ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð¸ Ð³Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?, Ð¸Ð¼ÐµÑ?Ð¾/Ð²ÐµÑ?Ð·Ð¸Ñ?Ð°Ñ?Ð° Ð½Ð° Ð¿Ð°ÐºÐµÑ?Ð¾Ñ? ÐºÐ¾Ñ? Ð³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?, Ð¿Ð¾Ñ?Ð°ÐºÐ¸Ñ?Ðµ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð¾Ð±Ð¸Ð²Ð°Ñ? Ð¾Ð´ Tor, Ð¸Ñ?Ð½."
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Ð?Ð²Ð°Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð±ÐµÑ?Ðµ Ñ?Ð¾Ð·Ð´Ð°Ð´ÐµÐ½Ð° Ñ?Ð¾ Ð´Ð¾Ð¶Ð´Ð¾Ñ?, Ð²Ð¸Ð½Ð¾Ð¶Ð¸Ñ?Ð°, ÐµÐ´Ð½Ð¾Ñ?Ð¾Ð·Ð¸, Ð¸ Ð¸Ñ?ÐºÑ?Ð¸ Ð·Ð° %s Ð½Ð° %s Ð²Ð¾ %s ."
 
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ð?Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ? Ð³Ð¾Ñ?Ð½Ð¸Ð²Ðµ Ð»Ð¸Ð½Ð¸Ð¸, Ð¾Ð´Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ð° Vidalia's Network, Ð¸ Ð¸Ð·Ð±ÐµÑ?Ð¸ \"Ð?Ð¾Ñ?Ð¾Ñ? ISP Ð³Ð¸ Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð²Ñ?Ñ?ÐºÐ¸Ñ?Ðµ ÐºÐ¾Ð½ Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð° Ð½Ð° Tor\". Ð?Ð¾Ñ?Ð¾Ð° Ð´Ð¾Ð´Ð°Ñ? Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð½Ð° Ñ?ÐµÐºÐ¾Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ ÐµÐ´Ð½Ð°Ñ?."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ñ?Ð²Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð·Ð° Ð¿Ð¾Ð²ÐµÑ?Ðµ %s Ñ?Ð¸Ð¿Ð¾Ð²Ð¸ Ð½Ð° Pluggable Transports %s ,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð°Ñ? Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð¿Ñ?Ð¸ Ð¼Ð°Ñ?ÐºÐ¸Ñ?Ð°Ñ?Ðµ Ð½Ð° Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð½ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°,\nÐ¿Ñ?Ð°Ð²ÐµÑ?Ñ?Ð¸ Ñ?Ð°\nÐ¿Ð¾Ñ?ÐµÑ?ÐºÐ° Ð·Ð° Ñ?ÐµÐºÐ¾Ñ? ÐºÐ¾Ñ? Ð³Ð¾ Ð½Ð°Ð´Ð³Ð»ÐµÐ´Ñ?Ð²Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð´Ð° Ñ?Ñ?Ð²Ñ?Ð´Ð¸ Ð´ÐµÐºÐ° Ð²Ð¸Ðµ\nÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Tor.\n"
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ð?Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ð° Ñ?Ðµ Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð°Ð»Ð½Ð¾ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸"
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Ð?ÐµÐºÐ¾Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ñ?Ð¾ IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸ Ñ?Ðµ Ð¸Ñ?Ñ?Ð¾ Ñ?Ð°ÐºÐ° Ð´Ð¾Ñ?Ñ?Ð°Ð¿Ð½Ð¸, Ð¿Ñ?ÐµÐºÑ? Ð½ÐµÐºÐ¾Ð¸ Pluggable\nTransports Ñ?Ñ?Ð¾ Ð½Ðµ Ñ?Ðµ ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð½Ð¸ Ñ?Ð¾ IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¾, BridgeDB Ð¸Ð¼Ð° Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %sÐ±ÐµÐ· Ð½Ð¸Ñ?Ñ? ÐµÐ´ÐµÐ½\nPluggable Transports %s Ð¿Ñ?ÐµÐºÑ? ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶ÐµÐ±Ð¸ Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ ÐºÑ?Ð», Ð½Ð¾ Ñ?Ð¸Ðµ Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð¼Ð¾Ð¶Ð°Ñ?\nÐ´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ? Ð²Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¸.\n\n"
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ð?Ð°Ð´Ð³Ñ?Ð°Ð´Ð¸ Ð³Ð¾ Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?Ð²Ð°Ñ? Ð²Ð¾ Firefox"
+#: bridgedb/strings.py:101
+msgid "What are bridges?"
+msgstr "Ð¨Ñ?Ð¾ Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸?"
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ð¸ Ð³Ð¸ Ð´Ð²Ð°Ñ?Ð° Ð·Ð±Ð¾Ñ?Ð°"
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ %s Ñ?Ðµ Tor Ñ?Ð°Ð·Ð»Ð¸ / Ñ?Ð²Ð¾Ñ?Ð¾Ð²Ð¸ ÐºÐ¾Ð¸ Ð²Ð¸ Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð°Ñ? Ð²Ð¾ Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°Ñ?Ð°."
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Ð§ÐµÐºÐ¾Ñ? 1"
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr "Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ð¼ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:108
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¿Ð°ÐºÐµÑ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ? Tor %s"
+msgid ""
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "Ð?Ñ?Ñ?Ð³ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ðµ Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s. \nÐ?Ð°Ð±ÐµÐ»ÐµÑ?ÐºÐ°: Ð?Ð¾Ñ?Ð°Ñ?Ðµ\nÐ´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð½Ð° ÐµÐ´ÐµÐ½ Ð¾Ð´ Ñ?Ð»ÐµÐ´Ð½Ð¸Ð²Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° / Ðµ-Ð¼Ð°Ð¸Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð¸:\n%s, %s Ð¸Ð»Ð¸ %s."
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Ð§ÐµÐºÐ¾Ñ? 2"
+#: bridgedb/strings.py:115
+msgid "My bridges don't work! I need help!"
+msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#: lib/bridgedb/templates/index.html:15
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
 #, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð?ÐµÐ¼Ð¸ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° %s"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Ð?ÐºÐ¾ Ñ?Ð²Ð¾Ñ?Ð¾Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸, Ñ?Ð¾Ð³Ð°Ñ? Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð° %s."
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
+msgid ""
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "Ð?ÐºÐ»Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð¾ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð·Ð° Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?, Ð²ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸ Ñ?Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð»Ð¸Ñ?Ñ?Ð° Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð¸ Pluggable Transports ÐºÐ¾Ð¸ Ð¿Ñ?Ð¾Ð±Ð°Ð²Ñ?Ðµ Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð½Ð° Tor Browser,\nÐ¸ Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð°ÐºÐ¸ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð°Ð²Ð° Tor Ð²Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ñ?, Ð¸Ñ?Ð½."
+
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð¼Ð¾Ñ?Ñ? ÐºÐ¾Ð½ÐµÐ½Ñ?Ð¸Ð¸:"
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Ð§ÐµÐºÐ¾Ñ? 3"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Ð?Ð¾Ð±Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸!"
 
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð·Ð° Ñ?Ð¸Ð¿ Ð½Ð° Ð¼Ð¾Ñ?Ñ?:"
+
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð°Ñ? IPv6 Ð°Ð´Ñ?ÐµÑ?Ð¸?"
+
+#: bridgedb/strings.py:135
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Ð?Ð°Ð»Ð¸ Ñ?Ð¸ Ñ?Ñ?ÐµÐ±Ð° %s?"
+
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "Ð?Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ? Ð½Ðµ Ð³Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ñ?Ð»Ð¸ÐºÐ¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾."
+
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Ð?Ð½ÐµÑ?ÐµÑ?Ðµ Ð³Ð¸ ÐºÐ°Ñ?Ð°ÐºÑ?ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´ Ñ?Ð»Ð¸ÐºÐ°Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ñ?Ðµ:"
+
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ð¡ÐµÐ³Ð° %s Ð´Ð¾Ð´Ð°Ñ? Ð³Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ð° Ð²Ð¾ Tor %s"
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Ð?Ð° Ð²Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ð²Ð¾ Tor Browser, Ð¿Ñ?Ð²Ð¾ Ð¾Ð´ÐµÑ?Ðµ Ð½Ð° %s Tor Browser Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ\nÑ?Ñ?Ñ?Ð°Ð½Ð°Ñ?Ð° %s Ð¸ Ð¿Ð¾Ñ?Ð¾Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?ÐµÐ·ÐµÐ¼Ð°Ñ?Ðµ Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Tor Browser."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Ð?Ð¾Ð³Ð° Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³Ð¾Ñ? 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸' Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ Ð½Ð° 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ\nÐ³Ð¾ Ð¸Ð½Ñ?Ñ?Ð°Ð»ÐµÑ?Ð¾Ñ? Ð´Ð¾Ð´ÐµÐºÐ° Ð´Ð° Ð²Ðµ Ð¿Ñ?Ð°Ñ?Ð°:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Ð?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ð¸Ð¾Ñ? Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ð° ÐºÐ¾Ð½ Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Ð?Ð´Ð±ÐµÑ?ÐµÑ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð¡Ð»ÐµÐ´Ð½Ð¾'. Ð?Ð° Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ·Ð°Ð»ÐµÐ¿ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð¾Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ð° Ð²Ð¾ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ð»ÐµÑ?Ð¾. Ð?Ð° ÐºÑ?Ð°Ñ? ÐºÐ»Ð¸ÐºÐ½ÐµÑ?Ðµ 'Ð?Ð¾Ð²Ñ?Ð·Ð¸', Ð¸\nÐ±Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ñ?Ñ?Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð¸! Ð?ÐºÐ¾ Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ð¿Ñ?Ð¾Ð±Ð°Ñ?Ñ?Ðµ Ñ?Ð¾ ÐºÐ»Ð¸ÐºÐ°Ñ?Ðµ Ð½Ð° 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÐºÐ¾Ð¿Ñ?ÐµÑ?Ð¾ Ð²Ð¾ 'Tor Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°' Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð³Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ð¸Ñ?Ðµ."
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "Ð?Ð° Ð¿Ð¾ÐºÐ°Ð¶Ñ?Ð²Ð° Ð¾Ð²Ð°Ð° Ð¿Ð¾Ñ?Ð°ÐºÐ°."
+
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° IPv6 Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Ð?Ð¾Ð±Ð°Ñ?Ñ?Ð²Ð° Pluggable Transport Ð¿Ð¾ Ñ?Ð¸Ð¿."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Ð?Ñ?ÐµÐ·ÐµÐ¼Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð° Ð¾Ð´ Ñ?Ð°Ð²Ð½Ð¸Ð¾Ñ? GnuPG ÐºÐ»Ñ?Ñ? Ð½Ð° BridgeDB."
diff --git a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
index 94bd12a..ca9505f 100644
--- a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,102 +1,388 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
-# shahril <mohd_shahril_96@xxxxxxxxx>, 2013
+# abuyop <abuyop@xxxxxxxxx>, 2017
+# Celine Yap Suet Ling <celine.sodawine@xxxxxxxxx>, 2017
+# danial abd talib <muhammaddanialabdtalib@xxxxxxxxx>, 2014
+# kz_gtr <kz_gtr@xxxxxxxxx>, 2014
+# Mohd Rukhairy Abdul Rahman <rukhairy@xxxxxxxxx>, 2014
+# Mohd Shahril Bin Zainol Abidin <mohd_shahril_96@xxxxxxxxx>, 2013
+# theundertakerjr666 <theundertakerjr666@xxxxxxxxx>, 2019
 # Weldan Jamili <mweldan@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-05 05:30+0000\n"
-"Last-Translator: shahril <mohd_shahril_96@xxxxxxxxx>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-09 01:07+0000\n"
+"Last-Translator: abuyop <abuyop@xxxxxxxxx>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "Apakah itu bridges ?"
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Lapor kesilapan kod"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod Sumber"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Sejarah log"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kenalan"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tunjuk Kod QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR Kod untuk talian 'bridge'"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Alamak, spaghettios!"
 
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Terdapat ralat ketika cuba mendapatkan KodQR anda."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QR Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk membuat salinan talian 'bridge' ke mobil dan alat-alat lain"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Tidak ada alat 'bridge' pada masa ini..."
+
+#: bridgedb/https/templates/bridges.html:132
 #, python-format
 msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s adalah tor relays yang akan membantu anda menghindari penapisan Internet."
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Anda boleh cuba %s balik ke %s dan pilih jenis 'bridge' lain!"
 
-#: lib/bridgedb/templates/base.html:39
-msgid "I need an alternative way of getting bridges!"
-msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Langkah %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Muat turun%s Pelayar Web Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Langkah%s2%s"
 
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Dapatkan %s titi %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Langkah%s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sPilih%s secara automatik 'bridges'!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Pilihan Lanjutan"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Tidak"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "tiada"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%suna Bridges"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Ini adalah mesej automatik; tidak perlu balas.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Ini adalah titi anda:"
+
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Cara lain bagi mencari alamat bridges awam adalah dengan menghantar email (dari %s atau alamat %s) ke %s dengan menulis 'get bridges' pada badan email tersebut."
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Awak telah mencapai had yang ditetapkan. Harap bersabar! Masa minimum yang ditetapkan diantara email adalah %s jam. Mana-mana emel yang di hantar pada masa ini tidak akan dilayan."
 
-#: lib/bridgedb/templates/base.html:48
-msgid "My bridges don't work! I need help!"
-msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (cantum COMMANDs untuk mendapat lebih dari satu pilihan dalam satu)"
 
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "Selamat Datang ke BridgeDB"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "JENIS angkutan semasa yang disokong:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Hai, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Hai, kawan!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Kunci Awam"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jika Tor kamu tidak berfungsi, kamu patut menghantar e-mel kepada %s. Cuba masukkan sebanyak mana info yang boleh terhadap permasalahan kamu, termasuk senarai bridges yang kamu guna, dan nama fail bundle dan versi bundle yang kamu guna, dan mesej yang Tor tunjukkan, dan lain-lain."
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Email ini dihasilkan dengan pelangi,kuda bertanduk satu, dan kelipan untuk %s diatas %s pada %s"
 
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: bridgedb/strings.py:72
+#, python-format
 msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Untuk menggunakan bridges di bawah, pergi ke halaman tetapan Rangkaian Vidalia, dan klik \"ISP saya menyekat sambungan saya ke rangkaian Tor\". Kemudian tambah setiap alamat bridges satu per satu."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB boleh memberi sambungan 'bridge' dengan beberapa %sjenis  sambungan (Pluggable Transports)%s,\nyang boleh meyembungi hubungan anda dalam Rangkaian Tor, yang membolehkan rangkaian anda dilindungi daripada pihak awam yang menapis litar Tor.\n\n"
 
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Tiada bridges pada masa sekarang."
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Bridge tertentu dengan alamat-alamat IPv6  juga boleh didapati, walaupun ada jenis Pluggable\n Transports yang tidak IPv6 serasi\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Selain itu, BridgeDB mempunyai banyak bridges yang dicadang %stanpa diperlukan\nPluggable Transports %s yang boleh memberi rasa tidak sedap, tetapi ia masih boleh menolong rangkaian anda dilindungi dalam kebanyakan kes.\n"
 
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Menaik taraf firefox anda"
+#: bridgedb/strings.py:101
+msgid "What are bridges?"
+msgstr "Apakah itu 'bridges'?"
 
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Tulis dua perkataan itu."
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %s adalah sambungan Tor yang menolong anda dari tapisan internet."
 
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Langkah 1"
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
 
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:108
 #, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Dapatkan %s Tor Browser Bundle %s."
+msgid ""
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "Cara lain untuk dapatkan bridge adalah untuk menghantar email kepada %s. Sila ambil perhatian anda harus\nmenghantar email dengan mengunakan alamat yang diberi oleh syarikat yang menyediakan email:\n%s,%s atau %s."
 
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Langkah 2"
+#: bridgedb/strings.py:115
+msgid "My bridges don't work! I need help!"
+msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
 
-#: lib/bridgedb/templates/index.html:15
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
 #, python-format
-msgid "Get %s bridges %s"
-msgstr "Dapatkan %s bridges %s"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
+msgid ""
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "Sila beri sebanyak mungkin informasi tentang kes anda, sila beri kandungan senarai bridge dan hubungan Pluggable Transport yang telah diguna, versi Pelayar Web Tor, dan segala mesej yang Tor paparkan, dan lain-lain .. "
+
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Berikut adalah bridge anda:"
 
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Langkah 3"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Dapat sambungan Bridges!"
 
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Sila pilih jenis bridge:"
+
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Anda perlukan alamat IPv6?"
+
+#: bridgedb/strings.py:135
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Perlukah anda %s?"
+
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "Pelayar anda tidak memaparkan imej dengan betul."
+
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Masukkan imej aksara yang tertera..."
+
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "Bagaimana cara untuk mula mengunakan bridges"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
 #, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Kemudian %s tambah bridges tersebut ke Tor %s"
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Untuk masuk bridges ke dalam Pelayar Web Tor, langkah pertama sila pilih %s halaman muat turun Pelayar Web Tor \n%s dan ikut arahan untuk muat turun dan mula Pelayar Web Tor Browser "
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Bila pilihan dialog jenis hubungan 'Tor Network Settings' dipaparkan, klik 'Konfigurasi' dan ikut nasihat yang disyorkan sehingga:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Adakah Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Pilih 'Ya' dan klik 'langkah seterusnya'. Untuk konfigurasi bridge baru, buat salinan jaringan bridges ke dalam kotak input teks. Step akhir, klik 'Hubung', dan anda patut dapat keputusan positif! Jika anda ada kesulitan, sila cuba klik 'Bantuan' dalam 'Tor Network Settings' guru untuk bantuan seterusnya"
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "Papar mesej ini."
+
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Pinta bridges yang disyorkan."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Pinta IPv6 bridges."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Pinta jalinan Pluggable Transport secara TYPE."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
diff --git a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
index a51b70e..60e81a7 100644
--- a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
@@ -4,24 +4,26 @@
 # 
 # Translators:
 # Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2014
+# Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>, 2016-2017
 # Erik Matson <erik@xxxxxxxxxxxxxxx>, 2015
-# Harald <haarektrans@xxxxxxxxx>, 2014
+# Harald H. <haarektrans@xxxxxxxxx>, 2014
 # Kristian Andre Henriksen <kris.andre.h@xxxxxxxxx>, 2015
-# lateralus, 2013
+# 81149148127a5edca7d06dcbfba79969, 2013
+# PÃ¥l Fiksdal <plf715@xxxxxxxxx>, 2015
 # Per Thorsheim <transifex@xxxxxxxxxxxxx>, 2015
 # thor574 <thor.hovden@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 12:17+0000\n"
-"Last-Translator: Erik Matson <erik@xxxxxxxxxxxxxxx>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/torproject/language/nb/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2017-12-29 18:29+0000\n"
+"Last-Translator: Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -36,57 +38,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Dette var leit! Noe gikk galt med forespÃ¸rselen din."
+msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Innrapporter feil"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Endringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Velg alt"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QR-kode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-kode for dine brolinjer"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oisann!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det oppsto en feil ved innhenting av din QR-kode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Det er for tiden ingen tilgjengelige broerâ?¦"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Last ned %s Tor-nettleseren %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Tilknytt %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sare gi meg noen broer!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avanserte valg"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ingen"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sT%silknytt broer"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisert melding; vennligst ikke svar.]"
+msgstr "[Dette er en automatisert melding; ikke svar.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Her er dine broer:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har gÃ¥tt over hastighetsbegrensningen. Vennligst ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre eposter i denne tidsperioden vil bli ignorert."
+msgstr "Du har overskredet hastighetsbegrensningen. Ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre e-poster i denne tidsperioden vil bli ignorert."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMMANDOer: (kombiner KOMMANDer to Ã¥ angi flere valg samtidig)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Velkommen til BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "NÃ¥vÃ¦rende stÃ¸ttede transport TYPEr:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hei, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hallo, lille venn!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸kler"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -97,7 +224,7 @@ msgstr "Denne e-posten ble laget med regnbuer, enhjÃ¸rninger og stjerneskudd for
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -108,7 +235,7 @@ msgid ""
 msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med Ã¥ tilslÃ¸re dine tilkoblinger til Tor-nettverket, noe som gjÃ¸r det\nvanskelig for noen som overvÃ¥ker din internett-trafikk Ã¥ fastsette hvorvidt du\nbruker Tor eller ei\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -120,29 +247,29 @@ msgstr "Noen broer med IPv6-adresser er ogsÃ¥ tilgjelgelige, dog er noen pluggba
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av internettsensur i de fleste fall.\n\n"
+msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av Internettsensur i de fleste fall.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Hva er broer?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Broer %s er Tor-tilknyttninger som hjelper deg med Ã¥ omgÃ¥ sensur."
+msgstr "%s Broer %s er Tor-rutingsstafettoppsett som hjelper deg med Ã¥ omgÃ¥ sensur."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg trenger en alternativ mÃ¥te Ã¥ fÃ¥ broer pÃ¥!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,238 +277,113 @@ msgid ""
 "%s, %s or %s."
 msgstr "En annen mÃ¥te tilknytte seg broer er Ã¥ sende en e-post til %s. Merk at du mÃ¥ sende\ne-post fra en adresse tilhÃ¸rende en av fÃ¸lgende e-posttilbydere:\n%s, %s eller %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
+msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om dit tilfelle du kan, inkludert en liste over\nbroene og pluggbare transporter du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte produsere, osv."
+msgstr "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte ha produsert, osv."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "FÃ¥ broer!"
+msgstr "Tilknytt broer!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Skriv inn bokstavene fra bildet ovenfor..."
+msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Hvordan starte med bruk av dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor Browser."
+msgstr "For Ã¥ sette opp broer i Tor-nettleseren, gÃ¥ fÃ¸rst til %s siden for nedlasting av Tor-nettleser\n%s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor-nettleseren."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp nye broer, 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."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Vis denne meldingen."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "EtterspÃ¸r IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "FÃ¥ kopi av BridgeDBs offentlige GnuPG-nÃ¸kkel."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporter en feil"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kildekode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Endringslogg"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Velg alle"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Vis QR kode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kode for dine brolinjer"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "PÃ¥ tryne i myra!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det oppsto en feil ved innhenting av din QR kode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Det er for tiden ingen tilgjengelige broer..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Steg %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Last ned %s Tor-nettleser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Steg %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hent %s broer %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Steg %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "NÃ¥ %s legg til broer til Tor-nettleser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sare gi meg noen broer!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Avanserte valg"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nei"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sT%silknytt broer"
diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 2880ab0..5ae1637 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -4,29 +4,33 @@
 # 
 # Translators:
 # Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
+# AndrÃ© Koot <meneer@xxxxxxxx>, 2016
 # Ann Boen <ann.boen@xxxxxxxxx>, 2014
-# Cleveridge <erwin.de.laat@xxxxxxxxxxxxxx>, 2014
+# bacovane <bart-ts@xxxxxxxxxxxx>, 2018-2019
+# Cleveridge <erwin.de.laat@xxxxxxxxxxxxxx>, 2014,2016
 # Dick, 2014
 # Johann Behrens <info@xxxxxxxxxxxxxx>, 2013
-# Mart3000, 2015
+# 53a60eabbf5124a226a7678001f9a57b, 2015
+# Not Much <1028484728393@xxxxxxxxxxxxxx>, 2018
 # Shondoit Walker <shondoit@xxxxxxxxx>, 2011
 # Marco Brohet <inactive+therbom@xxxxxxxxxxxxx>, 2012
 # Tom Becht <tombecht@xxxxxxx>, 2014
 # Tonko Mulder <tonko@xxxxxxxxxxxxxx>, 2015
+# Tonnes <tonnes.mb@xxxxxxxxx>, 2019
 # math1985 <transifex@xxxxxxxxxxxxxxxxxxx>, 2013
 # BBLN <webmaster@xxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-19 21:02+0000\n"
-"Last-Translator: Mart3000\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-14 17:58+0000\n"
+"Last-Translator: Tonnes <tonnes.mb@xxxxxxxxx>\n"
+"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -41,57 +45,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Er is iets mis gegaan met je verzoek."
+msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Een bug melden"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Broncode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Wijzigingslogboek"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Laat de QRCode zien"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode voor uw bridge regels"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Helaas pindakaas!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Er was een fout tijdens het ophalen van uw QRCode"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiÃ«ren naar mobiele of andere apparaten."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Er zijn momenteel geen bridges beschikbaar..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Stap %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Stap %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Download %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Stap %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sG%seef me gewoon bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Geavanceerde opties"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nee"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "geen"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%srijg Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Dit is een automatisch bericht, gelieve niet te beantwoorden.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Hier zijn je bridges:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Je hebt de rate limiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails gedurende deze periode worden genegeerd."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Welkom bij BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Huidig ondersteunde transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hoi, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Publieke Sleutels"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -102,7 +231,7 @@ msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -113,7 +242,7 @@ msgid ""
 msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -125,7 +254,7 @@ msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommig
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -134,20 +263,20 @@ msgid ""
 "\n"
 msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -155,61 +284,61 @@ msgid ""
 "%s, %s or %s."
 msgstr "Een alternatieve manier om bridges te verkrijgen is door een email te sturen naar %s. Houd er wel rekening mee dat je\nde email verstuurd via een van de volgende email aanbieders:\n%s, %s of %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Als uw Tor niet werkt, email dan naar %s."
+msgstr "Als je Tor niet werkt, email dan naar %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn je bridge regels:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Krijg Bridges!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Selecteer opties voor bridge type:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Heeft u IPv6 adressen nodig?"
+msgstr "Heb je IPv6 adressen nodig?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Heeft u een %s nodig?"
+msgstr "Heb je een %s nodig?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Voer de karakters in van de afbeelding hier beneden..."
+msgstr "Voer de tekens in van de afbeelding hier beneden..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Hoe te starten met het gebruik van je bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -218,21 +347,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -240,153 +369,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Toont dit bericht."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Vraag vanilla bridges aan."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Verzoek IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporteer een bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Broncode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Wijzigingslogboek"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Alles selecteren"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Laat de QRCode zien"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode voor je bridge regels"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Helaas pindakaas!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Er was een fout tijdens het ophalen van je QRCode"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Deze QRCode bevat je bridge regels. Scan het met een QRCode lezer om je bridge regels te kopiÃ«ren naar een mobiel of andere apparaten."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Er zijn momenteel geen bridges beschikbaar..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Stap %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Stap %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Download %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Stap %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "Geef me %sg%sewoon bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Geavanceerde Opties"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nee"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sK%srijg Bridges"
diff --git a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
index 6d266e8..50acee4 100644
--- a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
@@ -7,26 +7,26 @@
 # Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2013
 # JerBen <ayurveda63@xxxxxxxxx>, 2012
 # bogdrozd <bog.d@xxxxxxxxx>, 2013
-# Dawid <hoek@xxxxxxx>, 2014
+# Dawid Job <hoek@xxxxxxx>, 2014
 # Rikson <Ers@xxxxxxxxxxxx>, 2014
 # Karol Obartuch <kobartuch@xxxxxxx>, 2015
 # Krzysztof Å?ojowski <maxxxrally@xxxxxxxxx>, 2014
 # oirpos <kuba2707@xxxxxxxxx>, 2015
-# seb, 2014-2015
+# sebx, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 10:48+0000\n"
-"Last-Translator: Karol Obartuch <kobartuch@xxxxxxx>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -39,57 +39,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ZgÅ?oÅ? BÅ?Ä?d"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod ÅºrÃ³dÅ?owy"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Lista zmian"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "PokaÅ¼ KodQR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "KodQR dla Twoich linii bridge"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups, coÅ? poszÅ?o nie tak!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "WyglÄ?da na to, Å¼e napotkaliÅ?my na bÅ?Ä?d podczas prÃ³by pobrania Twojego kodu QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodÃ³w QR, aby skopiowaÄ? je do Twojego telefonu lub innych urzÄ?dzeÅ?."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aktualnie nie ma dostÄ?pnych Å¼adnych mostÃ³w..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Prawdpododobnie powinieneÅ? sprÃ³bowaÄ? %s wrÃ³ciÄ? %s i wybraÄ? inny typ mostu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pobierz %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Pobierz %s mostki %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s dodaj mosty do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sP%so prostu daj mi mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcje zaawansowane"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "brak"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sak!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sP%sozyskaj mosty"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[To jest wiadomoÅ?Ä? generowana automatycznie; prosimy na niÄ? nie odpisywaÄ?.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Oto Twoje mostki:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Przekroczono limit szybkoÅ?ci. ProszÄ? zwolnij! Minimalny czas pomiÄ?dzy \nwiadomoÅ?ci e-mail to %s godzin. Wszystkie dodatkowe e-maile w tym okresie bÄ?dÄ? ignorowane."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "POLECENIA: (Å?Ä?cz polecenia, aby sprecyzowaÄ? kilka opcji jednoczeÅ?nie)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Witamy w BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Obecnie obsÅ?ugiwane transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Witaj, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Witaj przyjacielu!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Klucze Publiczne"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -100,7 +225,7 @@ msgstr "Ten email zastaÅ? wygenerowany przez tÄ?cze, jednoroÅ¼ce i gwiazdki \ndl
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -111,7 +236,7 @@ msgid ""
 msgstr "BridgeDB moÅ¼e dostarczaÄ? poÅ?Ä?czenia mostkowe z kilkoma %stypes wÅ?Ä?czanymi protokoÅ?ami%s,\nktÃ³re mogÄ? pomÃ³c ukryÄ? Twoje poÅ?Ä?czenie do Sieci Tor, tworzÄ?c trudniejsze\ndo podsÅ?uchania dla osÃ³b obserwujÄ?cych ruch sieci w celu ustalenia gdzie siÄ? znajdujesz\nuÅ¼ywajÄ?c Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -123,7 +248,7 @@ msgstr "NiektÃ³re poÅ?Ä?czenia mostkowe z adresami IPv6 sÄ? rÃ³wnieÅ¼ dostÄ?pne,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -132,20 +257,20 @@ msgid ""
 "\n"
 msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostÃ³w %s bez \njakichkolwiek pluggable transports %s, ktÃ³re mogÄ? wydawaÄ? siÄ? niezbyt przydatne, \njednak w wielu przypadkach mogÄ? pomÃ³c w obejÅ?ciu cenzury.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Czym sÄ? mostki?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Mosty %s sÄ? wÄ?zÅ?ami w sieci Tor pomagajÄ?cymi w ominiÄ?ciu cenzury."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostkÃ³w!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -153,12 +278,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Innym sposobem na pozyskanie mostu jest wysÅ?anie wiadomoÅ?ci e-mail na adres %s. ProszÄ? pamiÄ?taÄ?, Å¼e naleÅ¼y \nwysÅ?aÄ? wiadomoÅ?Ä? uÅ¼ywajÄ?c adresu jednego z nastÄ?pujÄ?cych dostawcÃ³w poczty elektronicznej:\n%s, %s lub %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "JeÅ?li TwÃ³j Tor nie dziaÅ?a, powinieneÅ? wysÅ?aÄ? wiadomoÅ?Ä? e-mail na adres %s."
@@ -166,48 +291,48 @@ msgstr "JeÅ?li TwÃ³j Tor nie dziaÅ?a, powinieneÅ? wysÅ?aÄ? wiadomoÅ?Ä? e-mail na
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "SprÃ³buj zawrzeÄ? jak najwiecej informacji o swoim problemie, uwzglÄ?dniajÄ?c listÄ? mostÃ³w i Pluggable Transports, ktÃ³rych prÃ³bowaÅ?eÅ? uÅ¼yÄ?, wersjÄ? Tor Browser, wszelkie komunikaty, ktÃ³re zwrÃ³ciÅ? Tor i inne."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Oto Twoje poÅ?Ä?czenia z wykorzystaniem mostÃ³w:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "ZdobÄ?dÅº Mosty!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Czy potrzebujesz adresÃ³w IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Czy potrzebujesz %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazÃ³w prawidÅ?owo."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "WprowadÅº tekst z obrazka powyÅ¼ej..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Jak zaczÄ?Ä? uÅ¼ywaÄ? mostÃ³w"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -216,21 +341,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Czy TwÃ³j dostawca usÅ?ug internetowych (ISP) blokuje lub cenzuruje poÅ?Ä?czenia do sieci Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -238,153 +363,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "WyÅ?wietla tÄ? wiadomoÅ?Ä?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "PoproÅ? o regularne mosty."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "PoproÅ? o mosty IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Uzyskaj kopiÄ? klucza publicznego GnuPG BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ZgÅ?oÅ? BÅ?Ä?d"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kod ÅºrÃ³dÅ?owy"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Lista zmian"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Zaznacz wszystko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "PokaÅ¼ KodQR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "KodQR dla Twoich linii bridge"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ups, coÅ? poszÅ?o nie tak!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "WyglÄ?da na to, Å¼e napotkaliÅ?my na bÅ?Ä?d podczas prÃ³by pobrania Twojego kodu QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodÃ³w QR, aby skopiowaÄ? je do Twojego telefonu lub innych urzÄ?dzeÅ?."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Aktualnie nie ma dostÄ?pnych Å¼adnych mostÃ³w..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Prawdpododobnie powinieneÅ? sprÃ³bowaÄ? %s wrÃ³ciÄ? %s i wybraÄ? inny typ mostu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Pobierz %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Pobierz %s mostki %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s dodaj mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sP%so prostu daj mi mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcje zaawansowane"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sP%sozyskaj mosty"
diff --git a/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
index 1d98531..c61065c 100644
--- a/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
@@ -3,28 +3,33 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Alberto Castro, 2015
+# Alberto Castro, 2017
 # alfalb.as, 2015
 # AndrÃ© Monteiro <andre.monteir@xxxxxxxxx>, 2014
 # Bruno D. Rodrigues <bruno.rodrigues@xxxxxxxxx>, 2015
 # kagazz <lourenxo_619@xxxxxxxxxxx>, 2014
-# alfalb_mansil, 2014
-# MMSRS, 2015
-# Andrew Melim <nokostya.translation@xxxxxxxxx>, 2014
-# Pedro Albuquerque <palbuquerque73@xxxxxxxxx>, 2014-2015
-# SÃ©rgio Marques <smarquespt@xxxxxxxxx>, 2014
+# Manuela Silva <inactive+h_manuela_rodsilva@xxxxxxxxxxxxx>, 2015
+# MS <manuelarodsilva@xxxxxxxxx>, 2014,2017-2018
+# Manuela Silva <inactive+h_manuela_rodsilva@xxxxxxxxxxxxx>, 2015
+# Manuela Silva <inactive+h_manuela_rodsilva@xxxxxxxxxxxxx>, 2015
+# MS <manuelarodsilva@xxxxxxxxx>, 2018
+# Drew Melim <nokostya.translation@xxxxxxxxx>, 2014
+# Pedro Albuquerque <pmra@xxxxxxx>, 2014-2015
+# SÃ©rgio Marques <smarquespt@xxxxxxxxx>, 2014,2016
 # TiagoJMMC <tiagojmmc@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-02 23:34+0000\n"
-"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues@xxxxxxxxx>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -39,57 +44,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Reportar um erro"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "CÃ³digo fonte"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registo de alteraÃ§Ãµes"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contactos"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar CÃ³digo QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "CÃ³digo QR para as suas linhas de ponte"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ocorreu um erro!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que ocorreu um erro ao obter o seu CÃ³digo QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Este QRCode contÃ©m as suas linhas de ponte. Pesquise-as com um leitor de cÃ³digo QR para copiar as linhas de ponte para os dispositivos mÃ³veis e outros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Atualmente, nÃ£o existem pontes disponÃveis..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talvez devesse experimentar %s e voltar a %s, e escolhendo um tipo de ponte diferente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Transferir %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%sisponibilizem-me pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "OpÃ§Ãµes AvanÃ§adas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "NÃ£o"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nenhuma"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sim!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbter Pontes"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Esta Ã© uma mensagem automÃ¡tica; por favor, nÃ£o responda.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Aqui estÃ£o as suas pontes:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Excedeu a taxa limite. Por favor abrande! O tempo mÃnimo entre mensagens\neletrÃ³nicas Ã© de %s horas. Todas as mensagens seguintes durante este perÃodo serÃ£o ignoradas."
+msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mÃnimo entre e-mails \nÃ© de %s horas. Todos os e-mails seguintes durante este perÃodo serÃ£o ignorados."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMANDOS: (combine COMANDOS para especificar mÃºltiplas opÃ§Ãµes em simultÃ¢neo)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Bem-vindo ao BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Transport TYPEs suportados:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "OlÃ¡, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -100,7 +230,7 @@ msgstr "Esta mensagem foi gerada com arco-Ãris, unicÃ³rnios e estrelas\npara %s
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -108,57 +238,57 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "A BridgeDB pode fornecer pontes com vÃ¡rios %stypes de Pluggable Transports%s,\nque poderÃ£o ajudar a ocultar as suas ligaÃ§Ãµes Ã  Tor Network, tornando mais difÃcil\na filtragem do seu trÃ¡fego de Internet para determinar se estÃ¡ a usar o Tor.\n"
+msgstr "BridgeDB pode disponibilizar pontes com vÃ¡rios %stipos de Transportes LigÃ¡veis%s,\nque podem ajudar a ocultar as suas ligaÃ§Ãµes Ã  Rede Tor, tornando mais difÃcil\npara alguÃ©m monitorizar o seu trÃ¡fego na Internet para determinar se estÃ¡ a utilizar o Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "TambÃ©m estÃ£o disponÃveis algumas pontes com endereÃ§os IPv6. \nNo entanto, alguns Pluggable Transports nÃ£o sÃ£o compatÃveis com ligaÃ§Ãµes IPv6.\n\n"
+msgstr "TambÃ©m estÃ£o disponÃveis algumas pontes com endereÃ§os de IPv6, embora\nalguns Transportes LigÃ¡veis nÃ£o sÃ£o compatÃveis com IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem qualquer Pluggable Transports %s, o que pode nÃ£o parecer aliciante, mas\nque, ainda assim, ajudam a contornar a censura na Internet.\n"
+msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer Transportes LigÃ¡veis %s, o que poderÃ¡ nÃ£o parecer Ã³timo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontes %s sÃ£o relays Tor para ajudar a contornar a censura."
+msgstr "%s Pontes %s sÃ£o retransmissÃµes Tor que o ajudam a contornar a censura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Preciso de uma alternativa para obter pontes!"
+msgstr "Eu preciso de uma alternativa para obter pontes!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Outra forma de obter pontes Ã© enviar uma mensagem para %s. Por favor, note que\na mensagem tem de ser enviada de um dos seguintes fornecedores de serviÃ§o:\n%s, %s ou %s."
+msgstr "Outra forma para obter pontes, Ã© enviar uma mensagem para %s. Por favor, note que\ndeve enviar a mensagem utilizando um endereÃ§o dos seguintes fornecedores de e-mail\n%s, %s ou %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Se o seu Tor nÃ£o funciona, deve enviar uma mensagem para %s."
@@ -166,224 +296,100 @@ msgstr "Se o seu Tor nÃ£o funciona, deve enviar uma mensagem para %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ã£o sobre os problemas. Deve incluir a lista\nde pontes e Pluggable Transports que tentou utilizar, a sua versÃ£o Tor e \nquaisquer mensagens que o Tor retornou..."
+msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ã£o possÃvel sobre o seu caso, incluindo a lista\nde ligaÃ§Ãµes e Transportes LigÃ¡veis que tentou utilizar, a versÃ£o do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Aqui estÃ£o as suas linhas de ponte:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Obter pontes!"
+msgstr "Obter Pontes!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "Por favor selecione as opÃ§Ãµes para o tipo de ponte:"
+msgstr "Por favor, selecione as opÃ§Ãµes para o tipo de ponte:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Necessita de endereÃ§os IPv6?"
+msgstr "Precisa de endereÃ§os de IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Necessita de %s?"
+msgstr "Precisa de %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "O seu navegador nÃ£o estÃ¡ a mostrar as imagens apropriadamente."
+msgstr "O seu navegador nÃ£o estÃ¡ a exibir as imagens devidamente."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "Introduza os caracteres da imagem acima..."
+msgstr "Insira os carateres da imagem acima..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Como utilizar as suas pontes"
+msgstr "Como comeÃ§ar a utilizar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "Para inserir pontes no Tor Browser, siga as instruÃ§Ãµes na pÃ¡gina de transferÃªncias\n%s do Tor Browser %s para iniciar o Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Para inserir as ligaÃ§Ãµes no Tor Browser, aceda primeiro Ã  pagina %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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Assim que o diÃ¡logo de rede Tor aparecer, clique em Configurar e siga\nas intruÃ§Ãµes do assistente atÃ© que lhe pergunte:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "O seu fornecedor de serviÃ§o Internet (ISP) bloqueia ou censura as ligaÃ§Ãµes\n Ã  rede Tor?"
+msgstr "O seu Provedor de ServiÃ§o da Internet (ISP) bloqueia ou entÃ£o censura as ligaÃ§Ãµes\n Ã  rede Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e clique em 'Seguinte'. Para configurar as novas pontes, copie e\ncole as linhas de pontes na caixa de texto. Finalmente, clique em 'Conetar' e\ndeverÃ¡ estar pronto para continuar! Se ocorrerem erros, clique em 'Ajuda' no\nassistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais assistÃªncia."
+msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas pontes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeverÃ¡ estar pronto para continuar! Se encontrar problemas, tente clicar na 'Ajuda' no\nassistente de 'ConfiguraÃ§Ãµes da Rede Tor' para mais assistÃªncia."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr "Mostra esta mensagem."
+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.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Solicita as pontes bÃ¡sicas."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Solicita pontes IPv6."
+msgstr "Solicita pontes de IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicita um Pluggable Transport por TYPE."
+msgstr "Solicita um Transporte de ConexÃ£o por TIPO"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG da BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Reportar um erro"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "CÃ³digo fonte"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registo de alteraÃ§Ãµes"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contactos"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Escolher todos"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode para as suas linhas de ponte"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ocorreu um erro!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que ocorreu um erro ao obter o seu QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Este QRCode contÃ©m as suas linhas de ponte. Leia-o com um leitor de QRCode para copiar as linhas de ponte para dispositivos mÃ³veis."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Atualmente nÃ£o existem pontes livres..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Experimente utilizar %s voltando a %s e escolhendo um tipo de ponte diferente!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Transferir %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenha %s pontes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Agora %s adiciona as ligaÃ§Ãµes ao Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sA%spenas quero as pontes!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "OpÃ§Ãµes avanÃ§adas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "NÃ£o"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nenhuma"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbter pontes"
diff --git a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
index 0ebe010..9118c88 100644
--- a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
@@ -3,25 +3,35 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Communia <ameaneantie@xxxxxxxxxx>, 2013-2015
+# Communia <ameaneantie@xxxxxxxxxx>, 2013-2017
+# AndrÃ© Almeida <andrefalmeida@xxxxxxxxxxxxxx>, 2018
+# anominino anomino <anominino@xxxxxxxxxx>, 2018
+# ClÃ¡udio Carvalho <znnb@xxxxxxxx>, 2018
+# Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>, 2019
+# Danton Medrado, 2015
+# Eduardo Bonsi, 2015,2018
+# Eduardo Loeffel Noce Gobi <eduardogobi@xxxxxxxxxxx>, 2016-2017
 # Augustine <evandro@xxxxxxxxxxxxx>, 2013
-# Humberto Sartini <humberto@xxxxxxxxxxx>, 2014
+# Humberto Sartini, 2014
 # Isabel Ferreira, 2014
+# jhqpinto <jhqpinto@xxxxxxxxxxx>, 2018
 # JoÃ£o Paulo S.S <contato1908@xxxxxxxxx>, 2015
+# Kaio Soares Rauta <kaio_soares_rauta@xxxxxxxxxxxx>, 2015
+# Luciana Dark Blue <lucianadarkblue@xxxxxxxxx>, 2015
 # m4lqu1570 <>, 2012
 # Rodrigo Emmanuel Santana Borges <rodrigoesborges@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 19:39+0000\n"
-"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-10 18:26+0000\n"
+"Last-Translator: Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -36,68 +46,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Desculpe! Algo errado ocorreu com a sua solicitaÃ§Ã£o."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Relatar um Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "CÃ³digo Fonte:"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registro de alteraÃ§Ãµes"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contato"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar CÃ³digo QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "CÃ³digo QR para as suas pontes de conexÃ£o"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ai, caramba!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que houve um erro ao obter o seu CÃ³digo QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Este CÃ³digo QR contÃ©m as suas pontes de conexÃ£o. Escaneie com um leitor de CÃ³digo QR para copiar as pontes de conexÃ£o para dispositivos mÃ³veis e outros aparelhos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Atualmente nÃ£o hÃ¡ nenhuma ponte disponÃvel..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talvez vocÃª deva tentar %s voltar %s e escolher um outro tipo de ponte!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Fazer download do %s Navegador Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sA%spenas me dÃª pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "OpÃ§Ãµes AvanÃ§adas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "NÃ£o"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nenhum"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sim!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sObter%s Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Esta Ã© uma mensagem automÃ¡tica; por favor, nÃ£o responda.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Aqui estÃ£o suas pontes:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "VocÃª excedeu o limite. Mais devagar, por favor! O tempo mÃnimo entre\ne-mails Ã© de %s horas. Todos os outros e-mails serÃ£o ignorados durante este perÃodo."
+msgstr "VocÃª excedeu o quantidade limite. Mais devagar, por favor! O tempo mÃnimo entre\ne-mails Ã© de %s horas. Todos os outros e-mails serÃ£o ignorados durante este perÃodo."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combinar COMANDOS para especificar mÃºltiplas opÃ§Ãµes simultaneamente)"
+msgstr "COMANDOS: (combine COMANDOS para especificar mÃºltiplas opÃ§Ãµes simultaneamente)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Bem vindo ao BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport que possuem suporte atualmente:"
+msgstr "TIPOS de transporte compatÃveis no momento:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "OlÃ¡, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Este e-mail foi gerado com arco-Ãris, unicÃ³rnios e purpurina, por  %s, %s, Ã s %s."
+msgstr "Este e-mail foi gerado com arco-Ãris, unicÃ³rnios e brilho, para  %s, em %s, Ã s %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,44 +240,44 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB pode fornecer pontes com vÃ¡rios %stipos de â??â??Transportes PlugÃ¡veis%s,\nque podem ajudar a ofuscar suas conexÃµes com a Rede Tor, tornando mais\nddifÃcil para qualquer um ver seu trÃ¡fego de internet para determinar que vocÃª estÃ¡\nusando o Tor.\n"
+msgstr "BridgeDB pode fornecer pontes com vÃ¡rios %stipos de Transportadores PlugÃ¡veis%s,\nque podem ajudar a ocultar as suas conexÃµes com a rede Tor, tornando mais difÃcil,\npara quem estiver observando o seu trÃ¡fego na Internet, saber ao certo se vocÃª estÃ¡ usando Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Algumas pontes com endereÃ§os IPv6 tambÃ©m estÃ£o disponÃveis, mas alguns PLUGGABLE TRNAPORTS nÃ£o sÃ£o compatÃveis com o IPv6.\n"
+msgstr "Algumas pontes com endereÃ§os IPv6 tambÃ©m estÃ£o disponÃveis, embora alguns Transportadores PlugÃ¡veis nÃ£o sejam compatÃveis com IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "AlÃ©m disso, BridgeDB tem muitas pontes tradicionais %s sem nenhum PLUGGABLE TRANSPORTS%s, que podem ajudar a driblar a censura na internet em muitos casos.\n"
+msgstr "AlÃ©m disso, BridgeDB tem vÃ¡rias pontes simples %s sem quaisquer Transportadores PlugÃ¡veis %s, o que talvez nÃ£o pareÃ§a tÃ£o legal, mas pode ajudar a driblar a censura na Internet em muitos casos.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "O que sÃ£o pontes?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontes %s sÃ£o retransmissores Tor que ajudam a driblar a censura."
+msgstr "%s Pontes %s sÃ£o relÃ©s Tor que ajudam a driblar a censura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Preciso de um outro modo de obter pontes!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,12 +285,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lembre que vocÃª deve enviar o e-mail utilizando um endereÃ§o registrado em um dos seguintes provedores de e-mail: \n%s, %s ou %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Minhas pontes nÃ£o funcionam!  Preciso de ajuda!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Se o Tor nÃ£o funcionar, envie um e-mail %s."
@@ -163,48 +298,48 @@ msgstr "Se o Tor nÃ£o funcionar, envie um e-mail %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ãµes possÃveis sobre o seu caso, como a lista das pontes e dos PLUGGABLE TRANSPORTS que vocÃª tentou usar, a versÃ£o do seu navegador Tor e todas as mensagens que o Tor emitiu, etc."
+msgstr "Tente incluir o mÃ¡ximo de informaÃ§Ãµes possÃveis sobre o seu caso, junto com a lista de \npontes e Transportadores PlugÃ¡veis que vocÃª tentou utilizar, a versÃ£o do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Veja sua pontes ativas:"
+msgstr "Aqui estÃ£o as suas pontes de conexÃ£o:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Obtenha Pontes!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Por favor, selecione as opÃ§Ãµes de tipos de pontes:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "VocÃª precisa de endereÃ§os IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "VocÃª precisa de %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Seu navegador nÃ£o estÃ¡ mostrando as imagens corretamente."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Digite os caracteres da imagem acima..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Como comeÃ§ar a usar as suas pontes"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -213,175 +348,50 @@ 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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "O seu Provedor de ServiÃ§os de Internet (PSI) bloqueia ou censura conexÃµes\nÃ  rede Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e clique em 'PrÃ³ximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saÃda. Por fim, clique em 'Conectar'.\nIsso deve ser o suficiente! Se vocÃª encontrar problemas, tente clicar no botÃ£o\n'Ajuda' no assistente de 'ConfiguraÃ§Ãµes da Rede Tor', para mais assistÃªncia."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Mostrar essa mensagem."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Solicitar pontes VANILLA."
+msgstr "Solicitar pontes simples."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Solicitar pontes IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Requerer Transporte PlugÃ¡vel por TYPE"
+msgstr "Solicitar um Transportador PlugÃ¡vel por TIPO."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG do BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Relatar um Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "CÃ³digo Fonte:"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registro de alteraÃ§Ãµes"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contato"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecionar tudo"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode para as suas linhas de ponte"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ops, um erro!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que houve um erro ao obter seu QRCode"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Seu QRCode contÃ©m as linhas de pontes. DigitalizÃ¡-lo com um leitor de QRCode para copiar suas linhas de ponte para dispositivos mÃ³veis e outros."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Atualmente nÃ£o hÃ¡ nenhuma ponte disponÃvel..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Talvez vocÃª deva tentar %s voltar %s e escolher um outro tipo de ponte!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Fazer download do %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obter %s pontes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sS%sÃ³ me dÃª bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "OpÃ§Ãµes AvanÃ§adas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "NÃ£o"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtenha Bridges"
diff --git a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
index 30d3cb4..599051c 100644
--- a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
@@ -3,25 +3,27 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Adda.17 <adrianatrifoi@xxxxxxxxx>, 2013
+# A C <ana@xxxxxxxxxxxx>, 2019
+# Adda.17 <inactive+Adda.17@xxxxxxxxxxxxx>, 2013
+# Adrian Staicu <astaicu@xxxxxxxxx>, 2017
 # Ana <ana_maria_js@xxxxxxxxx>, 2015
-# axel_89 <axel_rap@xxxxxxxxx>, 2015
+# axel_89, 2015
 # Di N., 2015
-# Isus Satanescu <isus@xxxxxxxxxxxxxxx>, 2014
+# Isus Satanescu <inactive+isus@xxxxxxxxxxxxx>, 2014
 # laura berindei <lauraagavriloae@xxxxxxxxx>, 2014
 # clopotel <yo_sergiu05@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-29 13:56+0000\n"
-"Last-Translator: Di N.\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-08 20:34+0000\n"
+"Last-Translator: A C <ana@xxxxxxxxxxxx>\n"
+"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
@@ -36,68 +38,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Scuze ! Ceva a n-a mers cum trebuie!"
+msgstr "Scuze ! Ceva n-a mers cum trebuie!"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "RaporteazÄ? un bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Cod sursÄ?"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "SchimbÄ?ri"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selectare totalÄ?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "AratÄ? QRcod-ul"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Cod QR pentru punÈ?ile tale"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oops, ca sÄ? vezi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Se pare cÄ? s-a produs o eroare Ã®n obÈ?inerea codului QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Codul QR conÈ?ine punÈ?ile tale. ScaneazÄ?-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Pe moment nu existÄ? punÈ?i disponibile..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Poate ar trebui sÄ? %s mergi Ã®napoi %s È?i sÄ? alegi un alt tip de punte!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Pasul %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "DescarcÄ? %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Pasul %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ObÈ?ine %s punÈ?i %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Pasul %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Acum %s adaugÄ? punÈ?ile Ã®n Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "OpÈ?iuni avansate"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nu"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "niciunul/niciuna"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sD%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbÈ?ine Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Acesta este un mesaj automat; te rugÄ?m sÄ? nu rÄ?spunzi.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Acestea sunt punÈ?ile tale:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ai depÄ?È?it rata limitÄ?. Te rugÄ?m sÄ? o iei mai Ã®ncet! Timpul minim Ã®ntre\ne-mail-uri este %s ore. Toate e-mail-urile Ã®n acest interval vor fi ignorate."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combinÄ? COMMANDs pentru a specifica mai multe opÈ?iuni simultan)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Bine ai venit la BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs transport suportate actual:"
+msgstr "Transport TYPE-uri suportate momentan:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "BunÄ? , %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "BunÄ?, prietene!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Chei publice"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Acest e-mail a fost generat cu curcubee, inorogi È?i scÃ¢ntei \npentru %s Ã®n %s la %s."
+msgstr "Acest e-mail a fost generat cu inorogi, curcubee È?i scÃ¢ntei \npentru %s Ã®n %s la %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,10 +232,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB poate oferi punÈ?i cu cÃ¢teva %stypes de Pluggable Transports%s,\nce pot \"umbri\" conexiunile tale cÄ?tre Tor Network, fÄ?cÃ¢nd mai dificil,\npentru cine Ã®È?i urmÄ?reÈ?te traficul de Internet, sÄ? determine cÄ? de fapt\nfoloseÈ?ti Tor.\n"
+msgstr "BridgeDB poate oferi punÈ?i cu diferite tipuri de %sPluggable Transports %s,\nce pot ascunde conexiunile tale cÄ?tre Tor Network, fÄ?cÃ¢nd mai dificil \nde observat cÄ? foloseÈ?ti Tor\npentru cine Ã®È?i urmÄ?reÈ?te traficul de Internet.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -120,268 +247,143 @@ msgstr "Unele punÈ?i cu adrese IPv6 sunt disponibile, deÈ?i unele Pluggable\nTra
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ã?n plus, BridgeDB are multe punÈ?i simple %s fÄ?rÄ? nici o\nPluggable Transport %s ce poate nu pare aÈ?a cool, dar care pot\nde asemenea sÄ? ocoleascÄ? cenzura internetului, Ã®n multe cazuri.\n\n"
+msgstr "Ã?n plus, BridgeDB are multe punÈ?i simple %s fÄ?rÄ? niciun\nTransport Conectabil %s ce poate nu par aÈ?a cool, dar care pot\ntotuÈ?i sÄ? ajute la evitarea cenzurii Internetului Ã®n multe cazuri.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ce sunt punÈ?ile? "
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s punÈ?i %s sunt releuri Tor care te ajutÄ? sÄ? ocoleÈ?ti cenzura."
+msgstr "%s PunÈ?ile %s sunt releuri Tor care te ajutÄ? sÄ? eviÈ?i cenzura."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile !"
+msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "O altÄ? cale pentru a face punÈ?i este sÄ? trimiÈ?i un email cÄ?tre %s. Nu uita cÄ?\ntrebuie sa trimiÈ?i email-ul folosind o adresÄ? de la unul dintre urmÄ?torii furnizori de e-mail:\n%s, %s sau %s."
+msgstr "O altÄ? cale pentru a obÈ?ine punÈ?i este sÄ? trimiÈ?i un email cÄ?tre %s. Nu uita cÄ?\ntrebuie sa trimiÈ?i email-ul folosind o adresÄ? de la unul dintre urmÄ?torii furnizori de e-mail:\n%s, %s sau %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 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".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Daca Tor nu funcÅ£ioneazÄ?, trimite un mesaj la  %s ."
+msgstr "DacÄ? Tor nu funcÅ£ioneazÄ? pentru tine, trimite un mesaj la  %s ."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Ã?ncercÄ? sÄ? includezi cÃ¢t mai multe informaÈ?ii despre cazul tÄ?u pe cÃ¢t posibil, include lista de punÈ?i È?i Pluggable Transports pe care ai Ã®ncercat sÄ? le foloseÅ?ti, versiunea de Tor Browser È?i orice alt mesaj dat de Tor, etc."
+msgstr "Ã?ncercÄ? sÄ? incluzi cÃ¢t mai multe informaÈ?ii despre cazul tÄ?u pe cÃ¢t posibil, include lista de \npunÈ?i È?i Pluggable Transports pe care ai Ã®ncercat sÄ? le foloseÅ?ti, versiunea de navigator Tor Browser\nÈ?i orice alt mesaj dat de Tor, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Acestea sunt liniile de punÈ?i:"
+msgstr "Acestea sunt liniile tale de punÈ?i:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Ia punÈ?i!"
+msgstr "ObÈ?ine punÈ?i!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Alege opÈ?iunile pentru tipul de punte:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ai nevoie de adrese IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ai nevoie de %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Introdu caracterele din imaginea de mai sus..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Cum sÄ? Ã®ncepi sÄ? foloseÅ?ti punÈ?ile"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Pentru a introduce punÈ?i Ã®n browser-ul Tor, mai Ã®ntÃ¢i trebuie mers la %s descÄ?rcare browser Tor\npaginÄ? %s È?i apoi trebuie urmate instrucÈ?iunile de descÄ?rcare È?i iniÈ?ializare\na browser-ului Tor."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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Ä? 'ConfigureazÄ?' È?i urmeazÄ? \nindicaÈ?iile programului pÃ¢nÄ? cÃ¢nd Ã®È?i cere:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Furnizorul de servicii de Internet (ISP) Ã®È?i blocheazÄ? sau cenzureazÄ? conexiunile cÄ?tre reÈ?eaua Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "SelecteazÄ? 'Da' È?i apoi alege 'UrmÄ?torul'. Pentru a configura noile punÈ?i, copiazÄ? È?i coleazÄ? liniile cu punÈ?ile Ã®n cÄ?suÈ?a de text. Ã?n final, selecteazÄ? 'Conectare' È?i totul e gata! DacÄ? ai probleme, click pe 'Help' din 'SetÄ?ri ReÈ?ea Tor'."
+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'."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "AfiÈ?eazÄ? acest mesaj."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Cere punÈ?i simple."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Cere punÈ?i IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Cere un Pluggable Transport dupÄ? TYPE."
+msgstr "SolicitÄ? un Transport Conectabil dupÄ? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "ObÈ?ine o copie a cheii GnuPG publice a BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "RaporteazÄ? un bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Cod sursÄ?"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "SchimbÄ?ri"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selectare totalÄ?"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "AratÄ? QRcod-ul"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Cod QR pentru liniile tale de punte"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oops, ca sÄ? vezi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Se pare cÄ? s-a produs o eroare Ã®n Ã®ncercarea de a recupera codul QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Codul QR conÈ?ine liniile tale de punte. ScaneazÄ?-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Acum nu sunt punÈ?i disponibile..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Poate ar trebui sÄ? Ã®ncerci %s Ã®napoi %s È?i sÄ? alegeÈ?i un alt tip de punte!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Pas %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "DescarcÄ? %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Pas %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ia %s punÈ?i %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Pas %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Acum %s adÄ?ugaÈ?i punÈ?ile la Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "OpÈ?iuni avansate"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nu"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sI%sa punÈ?i"
diff --git a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
index 21bdb1b..f1b1475 100644
--- a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
@@ -3,29 +3,40 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Andrey, 2017
 # Andrey Yoker Ogurchikov <domovoy.yoker@xxxxxxxxx>, 2014
-# Evgrafov Denis <stereodenis@xxxxxxxxx>, 2014
+# Ð?Ð½Ñ?Ð¾Ð½ Ð¢Ð¾Ð»Ð¼Ð°Ñ?ÐµÐ² <a.tolmachev@xxxxxxxxxxxxxxxxxx>, 2016
+# Denis Denis <stereodenis@xxxxxxxxx>, 2014
+# Dmitry Schneider <adamred280@xxxxxxx>, 2019
 # Eugene, 2013
 # foo <im-infamous@xxxxxxxxx>, 2014
-# Ivan, 2015
-# joshua ridney <yachtcrew@xxxxxxx>, 2015
-# liquixis <liquixis@xxxxxxxxx>, 2012
+# Ð?Ð²Ð°Ð½ Ð?Ð°Ð¿ÐµÐ½ÐºÐ¾Ð², 2015
+# John Doe <koops1997+tmpgithub@xxxxxxxxx>, 2019
+# joshua ridney, 2015
+# Kalyuzhniy Aleksey, 2017
+# liquixis, 2012
+# Misha Dyachuk <Wikia@xxxxxxxxxxxxxx>, 2016
 # Oleg, 2014
-# Sergey Briskin <sergey.briskin@xxxxxxxxx>, 2014
+# Roberto Brigante, 2017
+# Sergey Briskin, 2014
+# Timofey Lisunov <solokot@xxxxxxxxx>, 2018
 # Valid Olov, 2014
+# vb[fbk <kisn23@xxxxxxx>, 2015
+# Ð?Ð¸ÐºÑ?Ð¾Ñ? Ð?Ñ?Ñ?Ñ?Ð¸Ð½ <rewanh59@xxxxxxxxx>, 2016
 # Vitaliy Grishenko, 2014
+# Uho Lot <yavinav@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 09:34+0000\n"
-"Last-Translator: Ivan\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-01 09:18+0000\n"
+"Last-Translator: Dmitry Schneider <adamred280@xxxxxxx>\n"
+"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
@@ -40,68 +51,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð¼."
+msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð§Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ñ? Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ð?Ñ?Ñ?Ð½Ð°Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð²Ñ?Ðµ"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "ÐÑ?, Ñ?Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ð¿Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ QR-ÐºÐ¾Ð´Ð°."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð². Ð?Ñ?Ñ?ÐºÐ°Ð½Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐµÐ³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð¾Ð¼, Ñ?Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸Ð¼ QR-ÐºÐ¾Ð´, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð² Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ðµ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð?Ð° Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ð?Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð¸Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ð¾Ð²Ð°Ñ?Ñ? %s Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?%s Ð¸ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ð°!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ð¨Ð°Ð³ %sâ??1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð¹Ñ?Ðµ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ð¨Ð°Ð³ %sâ??2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ñ? %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ð¨Ð°Ð³ %sâ??3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð?Ð°Ñ?ÐµÐ¼ %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð² Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ð?ÐµÑ?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ?%sÐ°! "
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²%s"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð¡Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð±Ñ?Ð»Ð¾ Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð½Ðµ Ð¾Ñ?Ð²ÐµÑ?Ð°Ð¹Ñ?Ðµ Ð½Ð° Ð½ÐµÐ³Ð¾.]"
+msgstr "[ÐÑ?Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¾Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð½Ðµ Ð¾Ñ?Ð²ÐµÑ?Ð°Ð¹Ñ?Ðµ Ð½Ð° Ð½ÐµÐ³Ð¾.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Ð?Ð¾Ð´Ð³Ð¾Ñ?Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?:"
+msgstr "Ð?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Ð?Ñ? Ð¿Ñ?ÐµÐ²Ñ?Ñ?Ð¸Ð»Ð¸ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?Ð¹ Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð¾Ð±Ð¾Ñ?Ð¾Ñ?Ñ?! Ð?Ð¸Ð½Ð¸Ð¼Ð°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾Ð¼ÐµÐ¶Ñ?Ñ?Ð¾Ðº Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¸ Ð¼ÐµÐ¶Ð´Ñ? \nÐ·Ð°Ð¿Ñ?Ð¾Ñ?Ð°Ð¼Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð²Ð»Ñ?ÐµÑ? %s Ñ?Ð°Ñ?Ð¾Ð². Ð?Ñ?Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ð¸Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð° Ð² Ñ?ÐµÑ?ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¾Ð³Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ñ?Ð¾Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ñ?."
+msgstr "Ð?Ñ? Ð¿Ñ?ÐµÐ²Ñ?Ñ?Ð¸Ð»Ð¸ Ð´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¿Ð¾Ð·Ð¶Ðµ!\nÐ?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?ÐµÑ?ÐµÐ· %s Ñ?Ð°Ñ?Ð¾Ð². Ð¡Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?, Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ð´Ð¾ Ñ?Ñ?Ð¾Ð³Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¸, Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ñ?Ð¾Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ñ?."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð«: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ?, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ð´Ð½Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¾ Ð¾Ð¿Ñ?Ð¸Ð¹)"
+msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð«: (Ñ?Ð¾Ð²Ð¼ÐµÑ?Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ?, Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¾ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¹ Ð¾Ð´Ð½Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ? Ð² BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ð?Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ðµ Ñ?Ð¸Ð¿Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° - TYPEs:"
+msgstr "Ð¢ÐµÐºÑ?Ñ?Ð¸Ð¹ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸  - TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "Ð-Ð³Ðµ-Ð³ÐµÐ¹, %s!"
+msgstr "ÐÐ¹, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Ð?Ñ?Ð¸Ð²ÐµÑ?, Ð´Ñ?Ñ?Ð³!"
+msgstr "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹, Ð´Ñ?Ñ?Ð³!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "ÐÑ?Ð¾ Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð±Ñ?Ð»Ð¾ Ñ?Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¾ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð³Ð¸, ÐµÐ´Ð¸Ð½Ð¾Ñ?Ð¾Ð³Ð¾Ð² Ð¸ Ñ?ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¸Ñ?Ð½Ð¸Ñ?\nÐ´Ð»Ñ? %s Ð² %s, Ð² %s."
+msgstr "ÐÑ?Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð±Ñ?Ð»Ð¾ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð³Ð¸, ÐµÐ´Ð¸Ð½Ð¾Ñ?Ð¾Ð³Ð¾Ð² Ð¸ Ñ?ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¸Ñ?Ð½Ð¸Ñ?\nÐ´Ð»Ñ? %s Ð² %s, Ð² %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,283 +245,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð²Ð°Ð¼ Ð¼Ð¾Ñ?Ñ?Ñ? Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ %s Ñ?Ð¸Ð¿Ð°Ð¼Ð¸ Pluggable Transports%s,\nÑ?Ñ?Ð¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð·Ð°Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ? Tor Network. Ð?Ð»Ð°Ð³Ð¾Ð´Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ð¼Ñ? Ð¿ÐµÑ?ÐµÑ?Ð²Ð°Ñ?Ñ?Ð¸ÐºÐ°Ð¼ Ñ?Ñ?Ð°Ñ?Ð¸ÐºÐ°\nÑ?Ð»Ð¾Ð¶Ð½ÐµÐµ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð°ÐºÑ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Ñ?ÐµÑ?Ð¸ Tor.\n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ñ? Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ %s Ñ?Ð¸Ð¿Ð°Ð¼Ð¸ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?%s,\nÑ?Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ? Ñ?Ð½Ð¸Ð·Ð¸Ñ?Ñ? Ñ?Ð¸Ñ?Ðº Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? Ð¸ Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ? Tor Network. Ð?Ð»Ð°Ð³Ð¾Ð´Ð°Ñ?Ñ? Ñ?Ñ?Ð¾Ð¼Ñ? Ð²Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ðº Ð² Ñ?ÐµÑ?Ð¸ Tor Ð¾Ñ?Ñ?Ð»ÐµÐ´Ð¸Ñ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?, Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6, Ñ?Ð¾Ñ?Ñ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Pluggable\nTransports Ð½Ðµ Ñ?Ð¾Ð²Ð¼ÐµÑ?Ñ?Ð¸Ð¼Ñ? Ñ? IPv6.\n\n"
+msgstr "Ð¡Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?, Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6, Ð½Ð¾ Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð»Ñ?Ñ?Ð°ÐµÐ² Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð° Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¿Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼ IPv6 Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ð?Ð¾Ð»ÐµÐµ Ñ?Ð¾Ð³Ð¾, BridgeDB Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾ Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s, Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ?\nÐ¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? %s, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ðµ Ñ?Ð°ÐºÐ¸Ð¼ ÐºÐ»Ñ?Ð²Ñ?Ð¼, Ð½Ð¾ Ð¾Ð½Ð¸ Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?\nÐ¼Ð¾Ð³Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ð¾Ð±Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?.\n"
+msgstr "Ð?Ð¾Ð»ÐµÐµ Ñ?Ð¾Ð³Ð¾, BridgeDB Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¼Ð½Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² %s, Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ð¹ Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ? %s, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð²Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð° Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°, Ñ?Ð°Ðº-Ð¶Ðµ Ð¾Ð½Ð¸ Ð²Ð¾ Ð¼Ð½Ð¾Ð³Ð¸Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð¾Ð±Ð¾Ð¹Ñ?Ð¸ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Ð§Ñ?Ð¾ Ñ?Ð°ÐºÐ¾Ðµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ??"
+msgstr "Ð§Ñ?Ð¾ Ñ?Ð°ÐºÐ¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ??"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ð?Ð¾Ñ?Ñ?Ñ? %s - Ñ?Ñ?Ð¾ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ? Tor, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ?Ñ? Ð²Ð°Ð¼ Ð¾Ð±Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
+msgstr "%s Ð?Ð¾Ñ?Ñ? %s â?? Ñ?Ñ?Ð¾ Ñ?ÐµÑ?ÐµÐ²Ð¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð² Ñ?ÐµÑ?Ð¸ Tor, ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ? Ð²Ð°Ð¼ Ð¿Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð°Ð¹Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Ð?Ð½Ðµ Ð½Ñ?Ð¶ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ñ?Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²!"
+msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹ Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð° Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° Ñ?Ð¾, \nÑ?Ñ?Ð¾ Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»ÐµÐ½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²: %s, %s Ð¸Ð»Ð¸ %s."
+msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ,  Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²: %s, %s Ð¸Ð»Ð¸ %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Ð?Ð¾Ð¸ Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ?! Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ!"
+msgstr "Ð?ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð¼! Ð?Ð¾Ð¼Ð¾Ð³Ð¸Ñ?Ðµ!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ñ?Ð»Ð¸ Ð²Ð°Ñ? Tor Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?, Ð½Ð°Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼ %s."
+msgstr "Ð?Ñ?Ð»Ð¸ Tor Ð½Ðµ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°ÐµÑ?Ñ?Ñ?, Ð½Ð°Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼ Ð½Ð° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ? %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð¹Ñ?ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¸Ñ?Ñ?ÐµÑ?Ð¿Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ð²Ð°Ñ?ÐµÐ¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ðµ, Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ð¸ Pluggable Transports, ÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ð²Ñ? Ð¿Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?, Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð?Ð? Tor Browser\nÐ¸ Ð²Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð½Ñ?Ðµ Ð¾Ñ? Tor Ñ?Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ?."
+msgstr "Ð?Ð»Ñ? Ð±Ñ?Ñ?Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð²Ð°Ñ?ÐµÐ¹ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ð² Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?ÐºÐ°Ð·Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ðµ, Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? Ð¸Ð¼Ñ? Ð¼Ð¾Ñ?Ñ?Ð° Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ, ÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ðµ Ð²Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð»Ð¸ Ð´Ð»Ñ? Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?, Ð° Ñ?Ð°ÐºÐ¶Ðµ Ð²ÐµÑ?Ñ?Ð¸Ñ? Tor Browser."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Ð?Ð¾Ð´Ð³Ð¾Ñ?Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²:"
+msgstr "Ð¡Ñ?Ñ?Ð¾ÐºÐ° Ð²Ð²Ð¾Ð´Ð° Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð¼Ð¾Ñ?Ñ?Ð¾Ð²:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?!"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð¼Ð¾Ñ?Ñ?Ð°!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ð´Ð»Ñ? Ñ?Ð¸Ð¿Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð°:"
+msgstr "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ñ?Ð¸Ð¿Ð° Ð¼Ð¾Ñ?Ñ?Ð°:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "Ð?Ñ?Ð¶Ð½Ñ? Ð»Ð¸ Ð²Ð°Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6?"
+msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Ð?Ð°Ð¼ Ð½Ñ?Ð¶ÐµÐ½ %s?"
+msgstr "Ð?Ñ?Ð´ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ?Ð¼ Ð¾Ð±Ñ?Ð°Ð·Ð¾Ð¼."
+msgstr "Ð?Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ñ? Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Ð?Ð°Ðº Ð½Ð°Ñ?Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð°Ð¼Ð¸"
+msgstr "Ð?Ð°Ðº Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Ð£Ð·Ð½Ð°Ñ?Ñ? ÐºÐ°Ðº Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ? Ð² %s Tor Browser Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°  Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð·Ð°Ð³Ñ?Ñ?Ð·Ð¾Ðº Tor Browser %s Ð³Ð´Ðµ Ñ?ÐµÑ?Ñ? Ð¾ \nÐ·Ð°Ð³Ñ?Ñ?Ð·ÐºÐµ Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐµ Tor Browser."
+msgstr "Ð§Ñ?Ð¾Ð±Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ð¹ Ð¼Ð¾Ñ?Ñ? Ð² %s Tor Browser, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Tor Browser %s Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ð¿Ð¾ Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ð½Ð¸Ñ? Ð¸ Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Ð?Ð¾Ð³Ð´Ð° Ð¿Ð¾Ñ?Ð²Ð¸Ñ?Ñ?Ñ? Ð¾ÐºÐ½Ð¾ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor', Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?' Ð¸ Ñ?Ð»ÐµÐ´Ñ?Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°, Ð¿Ð¾ÐºÐ° Ð¾Ð½ Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?Ñ? Ð²Ð¾Ð¿Ñ?Ð¾Ñ?:"
+msgstr "Ð?ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÑ? 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor', Ð´Ð°Ð»ÐµÐµ Ð½Ð°Ð¶Ð°Ñ?Ñ? 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ?' Ð¸ Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°, Ð¿Ð¾ÐºÐ° Ð²Ñ? Ð½Ðµ Ñ?Ð²Ð¸Ð´Ð¸Ñ?Ðµ Ð²Ð¾Ð¿Ñ?Ð¾Ñ?:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Ð?Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð¸Ð»Ð¸ ÐºÐ°Ðº-Ð»Ð¸Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?"
+msgstr "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ñ?ÐµÑ? Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ð»ÐµÐµ'. Ð?Ð»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð²Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¸\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²Ð¾Ð´Ð° Ñ?ÐµÐºÑ?Ñ?Ð°. Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?' Ð¸ \nÐ²Ñ?Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð·Ð°Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ?! Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ð¶Ð°Ñ?Ñ? Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ? 'Ð?Ð¾Ð¼Ð¾Ñ?Ñ?'\nÐ² Ð¼Ð°Ñ?Ñ?ÐµÑ?Ðµ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor' Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸."
+msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'Ð?Ð°Ð»ÐµÐµ'. Ð?Ð»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð²Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¸\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²Ð¾Ð´Ð° Ñ?ÐµÐºÑ?Ñ?Ð°. Ð? Ð½Ð°Ð¶Ð¸Ð¼Ð°ÐµÑ?Ðµ 'Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?'! Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼, Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÐ¾Ð¹ 'Ð?Ð¾Ð¼Ð¾Ñ?Ñ?'\nÐ²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ 'Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor' Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr "Ð?Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°ÐµÑ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ."
+msgstr "Ð?Ñ?Ð²Ð¾Ð´Ð¸Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²."
+msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ? Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¾Ð¹ IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? Ð¿Ð¾ TYPE"
+msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð¿Ð¸Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ð?Ð¾Ð³ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð²Ñ?Ñ?"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? QR-ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð²"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "ÐÑ?, Ñ?Ñ?Ð¾-Ñ?Ð¾ Ð¿Ð¾Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ð?Ð¾Ñ?Ð¾Ð¶Ðµ, Ð¿Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ QR-ÐºÐ¾Ð´Ð°."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "ÐÑ?Ð¾Ñ? QR-ÐºÐ¾Ð´ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð². Ð?Ñ?Ñ?ÐºÐ°Ð½Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ ÐµÐ³Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð¾Ð¼, Ñ?Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸Ð¼ QR-ÐºÐ¾Ð´, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¾Ð² Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ðµ Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ñ?Ñ?Ñ?Ð¾Ð¹Ñ?Ñ?Ð²Ð°"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð?Ð° Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ð?Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð¸Ñ? Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ð¾Ð²Ð°Ñ?Ñ? %s Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?%s Ð¸ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ð°!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ð¨Ð°Ð³ %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Ð?Ð? %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ð¨Ð°Ð³ %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ñ? %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ð¨Ð°Ð³ %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡ÐµÐ¹Ñ?Ð°Ñ? %s Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ð¼Ð¾Ñ?Ñ?Ñ? Ð² Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ?%sÑ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð°Ð¹Ñ?Ðµ Ð¼Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ð?ÐµÑ?"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÐ?%sÐ°! "
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÐ?%sÐ¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð¿Ð¸Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð¾Ð³Ð¾ GnuPG-ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
diff --git a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
index 241b182..23e3b7d 100644
--- a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
@@ -5,23 +5,24 @@
 # Translators:
 # elo, 2014
 # FooBar <thewired@xxxxxxxxxx>, 2015
+# Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>, 2019
 # Michal SlovÃ¡k <michalslovak2@xxxxxxxxxxx>, 2013
 # Roman 'Kaktuxista' Benji <romanbeno273@xxxxxxxxx>, 2014
 # StefanH <inactive+StefanH@xxxxxxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 19:16+0000\n"
-"Last-Translator: FooBar <thewired@xxxxxxxxxx>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-10 06:45+0000\n"
+"Last-Translator: Marek Ä?Ã¡pek <capek.marek@xxxxxxxxx>\n"
+"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -34,57 +35,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "PrepÃ¡Ä?te! NieÄ?o je zle s vaÅ¡ou poÅ¾iadavkou."
+msgstr "PrepÃ¡Ä?te! Pri spracovanÃ vaÅ¡ej poÅ¾iadavky sa vyskytla chyba."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "NahlÃ¡siÅ¥ chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ZdrojovÃ½ kÃ³d"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "PoslednÃ© zmeny"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄ?iÅ¥ vÅ¡etko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ZobraziÅ¥ QR KÃ³d"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kÃ³d vaÅ¡ich premostenÃ"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Do pekla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "ZdÃ¡ sa Å¾e nastala chyba pri zÃskavanÃ vÃ¡Å¡ho QR kÃ³du."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tento QR kÃ³d obsahuje vaÅ¡e prehostenia. MoÅ¾ete ho zoskenovaÅ¥ Ä?ÃtaÄ?kou QR kÃ³dov, ktorou ich skopÃrujete do mobilu Ä?i inÃ½ch zariadenÃ"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "PrÃ¡ve niesÃº dostupnÃ© Å¾iadne premostenia..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "MoÅ¾no by ste mohli skÃºsiÅ¥ %s ÃsÅ¥ spÃ¤Å¥ %s a vybraÅ¥ si inÃ½ typ premostenia."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "StiahnuÅ¥ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskajte %s premostenia %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sL%sen mi zobrazte premostenia!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "PokroÄ?ilÃ© moÅ¾nosti"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Å¾iadne"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÃ?%sno!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastaviÅ¥ Bridges"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Toto je automatickÃ¡ sprÃ¡va; prosÃm, neodpovedajte.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "PrekroÄ?ili ste rate limit. ProsÃm spomaÄ¾te. MinimÃ¡lny Ä?as medzi emailmi je %s hodÃn. VÅ¡etky dalÅ¡ie emaily poÄ?as tejto doby budÃº ignorovanÃ©."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "PRÃ?KAZY: (kombinujte prÃkazy na zadanie viac moÅ¾nostÃ naraz)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Vitajte v BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "PrÃ¡ve podporovanÃ© transport typy:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hej, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ahoj, priateÄ¾!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "Tento email bol generovanÃ½ s dÃºhami, jednoroÅ¾cami a trblietkami pre %
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,7 +232,7 @@ msgid ""
 msgstr "BridgeDB vÃ¡m dokÃ¡Å¾e ponÃºknuÅ¥ niekolko typov %spremostenÃ s Pluggable Transports%s,\nktorÃ© vÃ¡m pomÃ´Å¾u maskovaÅ¥ vaÅ¡e pripojenie na Tor Network, ktorÃ© ztaÅ¾Ã kaÅ¾dÃ©mu kto sleduje vaÅ¡e internetovÃ© pripojenie zistiÅ¥ to Å¾e pouÅ¾Ãvate Tor.\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "NiektorÃ© premostenia s IPv6 adresami sÃº taktieÅ¾ dostupnÃ©, ale niekto
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
 "\n"
 msgstr "DodatoÄ?ne, BridgeDB mÃ¡ dosÅ¥ pÃ´vodnych premostenÃ %s bez Å¾iadnych Pluggable Transports %s ktorÃ© moÅ¾no niesu aÅ¾ takÃ© cool, ale vo veÄ¾a prÃpadoch stÃ¡le dokÃ¡Å¾u obÃsÅ¥ cenzÃºrovanie internetu.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ä?o sÃº to premostenia?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s premostenia %s sÃº Tor relaye ktorÃ© vÃ¡m pomÃ¡haju obÃsÅ¥ cenzÃºru."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Potrebujem inÃ½ spÃ´sob ako zÃskaÅ¥ premostenia!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +274,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "DalÅ¡Ãm spÃ´sobom ako zÃskaÅ¥ premostenia je poslaÅ¥ mail na %s. \nEmail vÅ¡ak musÃte poslaÅ¥ pomocou adresy od jednÃ©ho z tÃ½chto poskytovateÄ¾ov:\n%s, %s alebo %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Moje premostenia nefungujÃº! Potrebujem pomoc!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ak vÃ¡Å¡ Tor nefunguje, skÃºste napÃsaÅ¥ email %s."
@@ -161,71 +287,71 @@ msgstr "Ak vÃ¡Å¡ Tor nefunguje, skÃºste napÃsaÅ¥ email %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "SkÃºste napÃsaÅ¥ Ä?o najviac informaciÃ o vaÅ¡om prÃpade, vrÃ¡tane zoznamu premostenÃ a Pluggable Transportov ktorÃ© ste skÃºÅ¡ali pouÅ¾iÅ¥, verzia Tor Browseru, a hlÃ¡Å¡ky ktorÃ© Tor vypÃsal, apod."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Tu sÃº vaÅ¡e premostenia:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "ZÃskaÅ¥ premostenia!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "ProsÃm vyberte si moÅ¾nosti na typ premostenia:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Potrebujete IPv6 adresy?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Potrebujete %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "VÃ¡Å¡ prehliadaÄ? nezobrazuje obrÃ¡zky sprÃ¡vne."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "VloÅ¾te znaky z obrÃ¡zku vyÅ¡Å¡ie..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ako zaÄ?aÅ¥ pouÅ¾ÃvaÅ¥ vaÅ¡e premostenia"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Na zadanie premostenÃ do Tor Browsera, najprv choÄ?te na %s download strÃ¡nku Tor Browsera %s a riaÄ?te sa inÅ¡trukiacmi na stiahnutie a zapnutie Tor Browsera."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokuje alebo nejak cenzuruje vÃ¡Å¡ PoskytovateÄ¾ Internetu (ISP) pripojenia k Sieti Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -233,153 +359,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Ã. "
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "ZobrazÃ tÃºto sprÃ¡vu."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "PoÅ¾iadaÅ¥ o pÃ´vodnÃ© premostenia."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "PoÅ¾iadaÅ¥ o IPv6 premostenia."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Stiahnite si kÃ³piu verejnÃ©ho klÃºÄ?a GNUPG  pre BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "NahlÃ¡siÅ¥ chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ZdrojovÃ½ kÃ³d"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "PoslednÃ© zmeny"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "OznaÄ?iÅ¥ vÅ¡etko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "ZobraziÅ¥ QR KÃ³d"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kÃ³d vaÅ¡ich premostenÃ"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Do pekla!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "ZdÃ¡ sa Å¾e nastala chyba pri zÃskavanÃ vÃ¡Å¡ho QR kÃ³du."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Tento QR kÃ³d obsahuje vaÅ¡e prehostenia. MoÅ¾ete ho zoskenovaÅ¥ Ä?ÃtaÄ?kou QR kÃ³dov, ktorou ich skopÃrujete do mobilu Ä?i inÃ½ch zariadenÃ"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "PrÃ¡ve niesÃº dostupnÃ© Å¾iadne premostenia..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "MoÅ¾no by ste mohli skÃºsiÅ¥ %s ÃsÅ¥ spÃ¤Å¥ %s a vybraÅ¥ si inÃ½ typ premostenia."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "StiahnuÅ¥ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ZÃskajte %s premostenia %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sL%sen mi zobrazte premostenia!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "PokroÄ?ilÃ© moÅ¾nosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastaviÅ¥ Bridges"
diff --git a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
index 91049c7..e3c8f9b 100644
--- a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Bujar Tafili, 2015
+# Mirela Pacani <milela00@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 22:30+0000\n"
-"Last-Translator: Bujar Tafili\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: Besnik <besnik@xxxxxxxxxxxxxxxxx>\n"
+"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,57 +31,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "KÃ«rkojmÃ« ndjesÃ«! DiÃ§ka shkoi keq me kÃ«rkesÃ«n tuaj."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Raportoni njÃ« gabim"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kodi Burimor"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Regjistri i ndryshimeve"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "PÃ«rzgjidhini tÃ« Gjitha"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tregoni Kodin QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Kodi QR pÃ«rlinjat e urave tuaja"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ã?farÃ« tersi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Duket se u has njÃ« gabim, duke marrÃ« Kodin tuaj QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ky Kod QR pÃ«rmban linja urash. Skanojeni me njÃ« lexues Kodi QR, qÃ« t'i kopjoni linjat e urave tuaja nÃ« celular, apo nÃ« pajisje tÃ« tjera."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "KÃ«tÃ« Ã§ast s'ka asnjÃ« urÃ« tÃ« disponueshme..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Ndoshta duhet tÃ« provoni tÃ« %s shkoni prapa %s dhe tÃ« zgjidhni njÃ« lloj tÃ« ndryshÃ«m ure!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hapi %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Shkarkoni %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Hapi %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Merrni %s ura %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Hapi %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tani %s shtojini urat tek Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sM%sÃ« jepni urat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opsionet e PÃ«rparuara"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Jo"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "asnjÃ«"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sP%so!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sM%serrni Urat"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ky Ã«shtÃ« njÃ« mesazh automatik; ju lutemi mos u pÃ«rgjigjni.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "KÃ«tu janÃ« urat tuaja:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ju e keni kapÃ«rcyer kufirin. Ju lutemi, mÃ« ngadalÃ«! Koha minimum midis \ne-postave Ã«shtÃ« %s orÃ«. TÃ« gjitha e-postat e tjera gjatÃ« kÃ«saj periudhe kohe do tÃ« injorohen."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (kombinojini COMMANDs pÃ«r tÃ« specifikuar zgjedhje tÃ« shumÃ«fishta njÃ«kohÃ«sisht)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "MirÃ« se erdhÃ«t tek BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Transport TYPEs tÃ« mbÃ«shtetura kÃ«tÃ« Ã§ast: "
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hej, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "PÃ«rshÃ«ndetje mik!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "KyÃ§a PublikÃ«"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Kjo e-postÃ« Ã«shtÃ« gjeneruar me ylberÃ«, njÃ«brirÃ«sha dhe shkÃ«ndija\
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
 msgstr "BridgeDB mund tÃ« ofrojÃ« ura me shumÃ« %slloje tÃ« Pluggable Transports%s,\nqÃ« mund tÃ« ndihmojÃ« fshehjen e lidhjeve tuaja pÃ«r Tor Network, duke e bÃ«rÃ« atÃ« mÃ« \ntÃ« vÃ«shtirÃ« pÃ«r kÃ«do qÃ« vÃ«zhgon trafikun tuaj tÃ« internetit, pÃ«r tÃ« pÃ«rcaktuar nÃ«se ju jeni\nduke pÃ«rdorur Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Disa ura me adresa IPv6 janÃ« po ashtu tÃ« mundshme, ndonÃ«se disa Plugg
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,33 +249,33 @@ msgid ""
 "\n"
 msgstr "PÃ«rveÃ§ kÃ«saj, BridgeDB ka shumÃ« ura %s tÃ« bezdisshme, pa ndonjÃ«\nPluggable Transports %s, Ã§ka ndoshta nuk do tÃ« tingÃ«llojÃ« mirÃ«, por ata ende\nmund tÃ« ndihmojnÃ« qÃ« ta anashkaloni censurÃ«n e internetit nÃ« shumÃ« raste.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ã?'janÃ« urat?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Urat %s janÃ« rele Tor, qÃ« ju ndihmojnÃ« tÃ« anashkaloni censurÃ«n."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "MÃ« nevojitet njÃ« mÃ«nyrÃ« alternative pÃ«r pÃ«rftimin e urave!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "NJÃ« mÃ«nyrÃ« tjetÃ«r pÃ«r tÃ« pÃ«rftuar ura Ã«shtÃ« tÃ« dÃ«rgoni njÃ« e-postÃ« tek %s. ju lutemi vini re se ju duhet\nta dÃ«rgoni e-postÃ«n, duke pÃ«rdorur njÃ« adresÃ« nga njÃ«ri prej ofruesve tÃ« e-postÃ«s nÃ« vijim:\n%s, %s ose %s."
+msgstr "NjÃ« mÃ«nyrÃ« tjetÃ«r pÃ«r tÃ« pÃ«rftuar ura Ã«shtÃ« tÃ« dÃ«rgoni njÃ« e-postÃ« tek %s. ju lutemi vini re se ju duhet\nta dÃ«rgoni e-postÃ«n, duke pÃ«rdorur njÃ« adresÃ« nga njÃ«ri prej ofruesve tÃ« e-postÃ«s nÃ« vijim:\n%s, %s ose %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Urat e mia nuk punojnÃ«! MÃ« duhet ndihmÃ«!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "NÃ«se Tor i juaj nuk punon, ju duhet t'i dÃ«rgoni e-postÃ« %s."
@@ -157,48 +283,48 @@ msgstr "NÃ«se Tor i juaj nuk punon, ju duhet t'i dÃ«rgoni e-postÃ« %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "PÃ«rpiquni tÃ« pÃ«rfshini sa mÃ« shumÃ« informacion qÃ« tÃ« mundeni rreth rastit tuaj, duke vendosur edhe listÃ«n e\nurave dhe Pluggable Transports qÃ« provuat tÃ« pÃ«rdorni, versionin tuaj tÃ« Tor Browser,\nsi dhe Ã§do mesazh qÃ« ka dhÃ«nÃ« Tor, etj."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "KÃ«tu janÃ« linjat e urave tuaja:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Merrni Ura!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ju lutemi pÃ«rzgjidhni mundÃ«sitÃ« pÃ«r llojin e urÃ«s:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "A ju nevojiten adresat IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "A ju nevojitet njÃ« %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Futini karakteret nga imazhi mÃ« sipÃ«r..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Si tÃ« nisni t'i pÃ«rdorni urat tuaja"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "A i pengon apo i censuron Ofruesi juaj i ShÃ«rbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Shfaq kÃ«tÃ« mesazh."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "KÃ«rkoni urat vanilje ose non-Pluggable Transport."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "KÃ«rkoni urat IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Merrni njÃ« kopje tÃ« kyÃ§it publik GnuPG tÃ« BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Raportoni njÃ« gabim"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kodi Burimor"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Regjistri i ndryshimeve"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "PÃ«rzgjidhini tÃ« Gjitha"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Tregoni Kodin QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Kodi QR pÃ«rlinjat e urave tuaja"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ã?farÃ« tersi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Duket se u has njÃ« gabim, duke marrÃ« Kodin tuaj QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ky Kod QR pÃ«rmban linja urash. Skanojeni me njÃ« lexues Kodi QR, qÃ« t'i kopjoni linjat e urave tuaja nÃ« celular, apo nÃ« pajisje tÃ« tjera."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "KÃ«tÃ« Ã§ast s'ka asnjÃ« urÃ« tÃ« disponueshme..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " Ndoshta duhet tÃ« provoni tÃ« %s shkoni prapa %s dhe tÃ« zgjidhni njÃ« lloj tÃ« ndryshÃ«m ure!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Hapi %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Shkarkoni %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Hapi %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Merrni %s ura %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Hapi %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tani %s shtojini urat tek Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sM%sÃ« jepni urat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opsionet e PÃ«rparuara"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Jo"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sM%serrni Urat"
diff --git a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
index 105597e..89ba25b 100644
--- a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,25 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# an lykin <lykin@xxxxxxxxxxxxxx>, 2018
+# Pseudoscops, 2018
 # obj.petit.a, 2014
 # Ivan Radeljic <radeljicivan85@xxxxxxxxx>, 2014-2015
+# Lidija <llazic.bgd@xxxxxxxxx>, 2015
 # Milenko Doder <milenko.doder@xxxxxxxxx>, 2015
 # obj.petit.a, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-10 09:32+0000\n"
-"Last-Translator: Milenko Doder <milenko.doder@xxxxxxxxx>\n"
-"Language-Team: Serbian (http://www.transifex.com/p/torproject/language/sr/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-08-29 01:57+0000\n"
+"Last-Translator: Pseudoscops\n"
+"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -32,57 +36,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?ÐµÑ?Ñ?Ð¾ Ñ?Ðµ Ð»Ð¾Ñ?Ðµ Ð´ÐµÑ?Ð¸Ð»Ð¾ Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¾Ð¼."
+msgstr "Ð?Ð·Ð²Ð¸Ð½Ð¸Ñ?Ðµ! Ð?Ð¾Ð³Ð¾Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ð²Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ?"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð¸Ð·Ð¼ÐµÐ½Ð°"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð²Ðµ"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ð£Ñ?, Ñ?Ñ?Ñ?Ð°Ñ?Ð½Ð¾!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð?Ð¾Ñ?Ð»Ð¾ Ñ?Ðµ Ð´Ð¾ Ð³Ñ?ÐµÑ?ÐºÐµ Ð¿Ñ?Ð¸ Ð½Ð°Ð±Ð°Ð²Ð»Ñ?Ð°Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ QR kÐ¾Ð´Ð°."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QR ÐºÐ¾Ð´ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°. Ð¡ÐºÐµÐ½Ð¸Ñ?Ð°Ñ?ÐµÑ? Ð³Ð° Ñ?Ð° Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¸Ñ?ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð»Ð¸ Ð²Ð°Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ðµ Ñ?Ñ?ÐµÑ?Ð°Ñ?Ðµ."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ %s Ð´Ð° Ñ?Ðµ Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ð?Ð¾Ñ?Ð°Ðº %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¼Ð¸Ñ?Ðµ %s Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ? %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ð?Ð¾Ñ?Ð°Ðº %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ð?Ð¾Ñ?Ð°Ðº %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¢Ð¾Ñ?%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ð?Ðµ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð½ÐµÐ¼Ð°"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ¢%sÐ¾!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ?%sÐ¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ð?Ð²Ð¾ Ñ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°; Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð²Ð°Ñ? Ð´Ð° Ð½Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ðµ.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¸Ð³Ð»Ð¸ Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð»Ð¸Ð¼Ð¸Ñ?. Ð?Ð¾Ð»Ð¸Ð¼, Ñ?Ñ?Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ! Ð?Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð¸Ð·Ð¼ÐµÑ?Ñ?\nÐµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ðµ %s Ñ?Ð°Ñ?Ð¸. Ð¡Ð²Ð° Ð½Ð°Ñ?ÐµÐ´Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ð¾ÐºÐ¾Ð¼ Ð¾Ð²Ð¾Ð³ Ð¿ÐµÑ?Ð¸Ð¾Ð´Ð° Ð±Ð¸Ñ?Ðµ Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°.  "
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (ÐºÐ¾Ð¼Ð±Ð¸Ð½Ñ?Ñ?Ñ?Ðµ COMMANDs Ð´Ð° Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ð²Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð¸Ñ?Ñ?Ð¾Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ð?Ð¾Ð±Ñ?Ð¾Ð´Ð¾Ñ?Ð»Ð¸ Ñ? BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ transport TYPEs:"
+msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð¢Ð?Ð? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð°:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ñ?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ?ÐµÐ²Ð¸"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +222,7 @@ msgstr "Ð?Ð²Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ñ?ÐµÐ½Ð° Ñ?Ð° Ð´Ñ?Ð³Ð°Ð¼Ð°, Ñ?ÐµÐ´
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,57 +230,57 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ðµ Ñ?Ð° Ð²Ð¸Ñ?Ðµ %s Ñ?Ð¸Ð¿Ð¾Ð²Ð° Pluggable Transports %s,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ð¸Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ñ?Ð° Ñ?Ð° Ð¢Ð¾Ñ? Ð?Ñ?ÐµÐ¶Ð¾Ð¼ Ð´Ð° Ð±Ð¸ Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ð¼Ðµ ÐºÐ¾\nÐ¿Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÐ½ÐµÑ? Ñ?Ð°Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð±Ð¸Ð»Ð¾ Ñ?ÐµÐ¶Ðµ Ð´Ð° Ñ?Ñ?Ð²Ñ?Ð´Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?.\n\n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ %s Ñ?Ð¸Ð¿Ð¾Ð²Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð° %s,\nÑ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð²Ð°Ñ?Ð¸Ñ? ÐºÐ¾Ð½ÐµÐºÑ?Ð¸Ñ?Ð° Ñ?Ð° Ð?Ñ?ÐµÐ¶Ð¾Ð¼ Ð¢Ð¾Ñ?, ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð±Ð¸Ð»Ð¾\nÐºÐ¾Ð¼Ðµ ÐºÐ¾ Ð¿Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ð° Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÐ½ÐµÑ? Ñ?Ð°Ð¾Ð±Ñ?Ð°Ñ?Ð°Ñ? Ð±Ð¸Ð»Ð¾ Ñ?ÐµÐ¶Ðµ Ð´Ð° Ñ?Ñ?Ð²Ñ?Ð´Ð¸ Ð´Ð°\nÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¢Ð¾Ñ?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Ð?ÐµÐºÐ¸ Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð¸ Ñ?Ð° IPv6 Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð° Ñ?Ñ? Ñ?Ð°ÐºÐ¾Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸, Ð¼Ð°Ð´Ð° Ð½ÐµÐºÐ¸ Pluggable\n\nTransports Ð½Ð¸Ñ?Ñ? ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð½Ð¸ Ñ?Ð° IPv6.\n\n"
+msgstr "Ð?ÐµÐºÐ¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ñ?Ð° IPv6 Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð° Ñ?Ñ? Ñ?Ð°ÐºÐ¾Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸, Ð¼Ð°Ð´Ð° Ð½ÐµÐºÐ¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¸\nÐ¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ð½Ð¸Ñ?Ñ? ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð½Ð¸ Ñ?Ð° IPv6.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ð?Ð¾Ñ?ÐµÐ´ Ñ?Ð¾Ð³Ð°, BridgeDB Ð¸Ð¼Ð° Ð¿Ñ?Ð½Ð¾ Ð½Ð°Ñ?Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð° %s Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¸Ñ?\nPluggable Transports %s Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ Ñ?Ð¾Ð»Ð¸ÐºÐ¾ ÐºÑ?Ð», Ð°Ð»Ð¸ Ð¾Ð½Ð¸ Ð¸Ð¿Ð°Ðº\nÑ? Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ²Ð° Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð¾Ð±Ð¸Ñ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°.\n"
+msgstr "Ð?Ð¾Ñ?ÐµÐ´ Ñ?Ð¾Ð³Ð°, BridgeDB Ð¸Ð¼Ð° Ð¿Ñ?Ð½Ð¾ Ð½Ð°Ñ?Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° %s Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¸Ñ?\nÐ¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð° %s Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð¸ Ñ?Ð¾Ð»Ð¸ÐºÐ¾ ÐºÑ?Ð», Ð°Ð»Ð¸ Ð¾Ð½Ð¸ Ð¸Ð¿Ð°Ðº\nÑ? Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ²Ð° Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð¾Ð±Ð¸Ñ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð°.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð° Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ %s Ñ?Ñ? Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð½Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸ Ð?Ð°Ð¼ Ð¿Ð¾Ð¼Ð°Ð¶Ñ? Ð´Ð° Ð·Ð°Ð¾Ð±Ð¸Ñ?ÐµÑ?Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð¼Ð¸ Ñ?Ðµ Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð·Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "Ð?Ð¾Ñ? Ñ?ÐµÐ´Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð¼Ð¾Ñ?Ñ?Ð¾Ð²Ð° Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¸-Ð¼ÐµÑ?Ð» Ð½Ð° %s. Ð£Ð·Ð¼Ð¸Ñ?Ðµ Ñ? Ð¾Ð±Ð·Ð¸Ñ? Ð´Ð°\nÐ¼Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð¸-Ð¼ÐµÑ?Ð» ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¾Ð´ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¸-Ð¼ÐµÑ?Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð°.\n%s, %s Ð¸Ð»Ð¸ %s."
+msgstr "Ð?Ð¾Ñ? Ñ?ÐµÐ´Ð°Ð½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¸-Ð¼ÐµÑ?Ð» Ð½Ð° %s. Ð£Ð·Ð¼Ð¸Ñ?Ðµ Ñ? Ð¾Ð±Ð·Ð¸Ñ? Ð´Ð°\nÐ¼Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¸-Ð¼ÐµÑ?Ð» ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¾Ð´ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¸-Ð¼ÐµÑ?Ð» Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?Ð°.\n%s, %s Ð¸Ð»Ð¸ %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð¸ Ð½Ðµ Ñ?Ð°Ð´Ðµ! Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð¼Ð¸ Ñ?Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ð?ÐºÐ¾ Ð?Ð°Ñ? Ð¢Ð¾Ñ? Ð½Ðµ Ñ?Ð°Ð´Ð¸, Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?Ñ? %s."
@@ -159,225 +288,100 @@ msgstr "Ð?ÐºÐ¾ Ð?Ð°Ñ? Ð¢Ð¾Ñ? Ð½Ðµ Ñ?Ð°Ð´Ð¸, Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Unesite Å¡to viÅ¡e informacija o vaÅ¡em sluÄ?aju, ukljuÄ?ujuÄ?i: spisak\nmostova i prikljuÄ?ivih transporta koje ste pokuÅ¡ali da koristite, verziju\nvaÅ¡eg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd."
+msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¾ Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð° Ð¾ Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?, Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº\nÐ¼Ð¾Ñ?Ñ?Ð¾Ð²Ð° Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ð¸Ð²Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ, \nÐ²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ð²Ð°Ñ?ÐµÐ³ Ñ?Ð¾Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð°, Ð±Ð¸Ð»Ð¾ \nÐºÐ¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ñ?Ñ? Ð²Ð°Ð¼ Ñ?Ðµ Ð¢Ð¾Ñ? Ð¸Ð·Ð±Ð°Ñ?Ð¸Ð¾, Ð¸Ñ?Ð´."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Evo vaÅ¡ih premoÅ¡Ä?ivaÄ?a:"
+msgstr "Ð?Ð²Ð¾ Ð?Ð°Ñ?Ð¸Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ?, Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ñ? Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ IPv6 Ð°Ð´Ñ?ÐµÑ?Ðµ?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð?Ð°Ð¼ Ñ?Ñ?ÐµÐ±Ð° %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð½Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÐµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ Ñ?Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð·Ð½Ð°Ð´..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ð?Ð°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð?Ð°Ñ?Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i \nstartovanje Tor Brauzera."
+msgstr "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? Tor, Ð¿Ñ?Ð²Ð¸ Ð¸Ð´Ð¸Ñ?Ðµ Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð¸ %s Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ %s \nÐ¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¸ Ñ?Ð°Ð¼Ð¾ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð·Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ 'Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ðµ' Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³ Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¸' Ð¸ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ð¸Ñ?Ð°Ñ?Ñ?:"
+msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ Ð´Ð¸Ñ?Ð°Ð»Ð¾Ð³ 'Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ðµ' Ð¿Ð¾Ñ?Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ 'Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð¸' Ð¸ Ð¿Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð° Ð´Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ð°:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð²Ð°Ñ? Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? (Ð?Ð¡Ð?) Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¸Ð»Ð¸ Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¢Ð¾Ñ? Ð¼Ñ?ÐµÐ¶Ñ??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selektujte 'Yes' i onda kliknite na 'Next'. Da biste konfigurisali vaÅ¡e nove mostove,\niskopirajte i pejstujte premoÅ¡Ä?ivaÄ?e u polje za unos teksta. KonaÄ?no, kliknite na\n'Connect', i spremni ste za polazak! Ako budete imali problema, kliknite na 'Help'\ndugme u 'Tor Network Settings' Ä?arobnjaku da biste dobili dalju pomoÄ?."
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ 'Ð?Ð°' Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ'. Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ð»Ð¸ Ñ?Ð²Ð¾Ñ?Ðµ Ð½Ð¾Ð²Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ, ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð¸\nÐ½Ð°Ð»ÐµÐ¿Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ðµ Ð·Ð° Ñ?Ð½Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°. Ð?Ð¾Ð½Ð°Ñ?Ð½Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° 'ÐºÐ¾Ð½ÐµÐºÑ?Ñ?Ñ? Ñ?Ðµ', i\nÐ¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ! Ð?ÐºÐ¾ Ð±Ñ?Ð´ÐµÑ?Ðµ Ð¸Ð¼Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ 'Ð?Ð¾Ð¼Ð¾Ñ?'\nÑ? Ñ?Ð°Ñ?Ð¾Ð±Ñ?Ð°ÐºÐ· Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ Ð¢Ð¾Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ñ?Ð»Ð¸ÐºÑ?."
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Zahtevati vanila mostove."
+msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° Ð±Ð°Ð·Ð¸Ñ?Ð½Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¶Ð¸Ñ?Ðµ IPv6 Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
+msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° IPv6 Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Zahtevati PrikljuÄ?ivi Transport po TIPU."
+msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ±Ð° Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð¿Ð¾ Ð¢Ð?Ð?Ð£."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? BridgeDB Ñ?Ð°Ð²Ð½Ð¾Ð³ GnuPG ÐºÑ?Ñ?Ñ?Ð°."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ?."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Promena loga"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð²Ðµ"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kod za vaÅ¡e premoÅ¡Ä?ivaÄ?e"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ð£Ñ?, Ñ?Ñ?Ñ?Ð°Ñ?Ð½Ð¾!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "DoÅ¡lo je do greÅ¡ke pri nabavljanju vaÅ¡eg QR koda."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "QR kod sadrÅ¾i vaÅ¡e premoÅ¡Ä?ivaÄ?e. Skenirajte ga sa Ä?itaÄ?em QR koda da biste iskopirali vaÅ¡e premoÅ¡Ä?ivaÄ?e na mobilne kao i druge ureÄ?aje."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ %s Ð´Ð° Ñ?Ðµ Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð°!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ð?Ð¾Ñ?Ð°Ðº %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¼Ð¸Ñ?Ðµ %s Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ð?Ð¾Ñ?Ð°Ðº %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ %s Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ð?Ð¾Ñ?Ð°Ðº %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ? Ð¢Ð¾Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ð?Ðµ"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÐ¢%sÐ¾!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÐ?%sÐ¾Ð±Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
+msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? ÐºÑ?Ñ?Ñ?Ð° BridgeDB Ñ?Ð°Ð²Ð½Ð¾Ð³ GnuPG."
diff --git a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
index 3c3e4d4..8cc0f27 100644
--- a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
@@ -5,25 +5,28 @@
 # Translators:
 # Anders Jensen-Urstad <anders@xxxxxxx>, 2014
 # Emil Johansson <emil.a.johansson@xxxxxxxxx>, 2015
-# GabSeb, 2014
+# Gabor Sebastiani, 2014
+# Jacob Andersson <jacob.c.andersson@xxxxxxxxxxxxxx>, 2018
+# Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018-2019
 # Peter Michanek <peter@xxxxxxxxxxx>, 2015
 # Petomatick <petomatick@xxxxxxxxxxx>, 2011
 # ph AA, 2015
-# phst <transifex@xxxxxxxxxx>, 2014
+# phst, 2014
 # leveebreaks, 2014
 # WinterFairy <winterfairy@xxxxxxxxxx>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-30 21:24+0000\n"
-"Last-Translator: Peter Michanek <peter@xxxxxxxxxxx>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-01 08:49+0000\n"
+"Last-Translator: Jonatan Nyberg\n"
+"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -38,57 +41,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "NÃ¥got gick tyvÃ¤rr fel med din fÃ¶rfrÃ¥gan."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapportera ett fel"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "KÃ¤llkod"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ã?ndringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Markera allt"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Visa QR-kod"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-kod fÃ¶r dina brorader"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Bomber och granater, nÃ¥got gick snett!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det verkar som att ett fel orsakade problem att fÃ¥ din QR-kod."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denna QR-kod innehÃ¥ller dina rader med broar. Skanna den med en QR-kodlÃ¤sare fÃ¶r att kopiera dina rader med broar till mobila och andra enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "FÃ¶r nÃ¤rvarande finns inga broar tillgÃ¤ngliga..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Prova att %s gÃ¥ tillbaka %s fÃ¶r att vÃ¤lja en annan typ av bro!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "HÃ¤mta %s Tor Browser  %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Skaffa %s broar %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "LÃ¤gg nu till %s broarna till Tor Browser%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sara ge mig broar!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avancerade instÃ¤llningar"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nej"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "inget"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sÃ¤mta broar"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Detta Ã¤r ett automatiskt meddelande; Var god svara ej]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "HÃ¤r Ã¤r dina bryggor:"
+msgstr "HÃ¤r Ã¤r dina broar:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Du har Ã¶verskridit din nivÃ¥. Ta det lugnt! Minsta tillÃ¥tna tiden mellan epost Ã¤r %s timmar. Epost utÃ¶ver detta kommer att ignoreras."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMMANDOn: (kombinera KOMMANDOn fÃ¶r att ange flera val pÃ¥ en gÃ¥ng)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "VÃ¤lkommen till BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "FÃ¶r nÃ¤rvarande stÃ¶ds fÃ¶ljande transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hej, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hej, kompis!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +227,7 @@ msgstr "Det hÃ¤r mailet skapades med hjÃ¤lp av regnbÃ¥gar, enhÃ¶rningar och \net
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,44 +235,44 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB kan tillhandahÃ¥lla bryggor med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gÃ¶r det svÃ¥rare fÃ¶r nÃ¥gon\nsom avlyssnar din internetuppkoppling att veta ifall du anvÃ¤nder Tor.\n\n"
+msgstr "BridgeDB kan tillhandahÃ¥lla broar med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gÃ¶r det svÃ¥rare fÃ¶r nÃ¥gon\nsom avlyssnar din internetuppkoppling att veta ifall du anvÃ¤nder Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Det finns nÃ¥gra bryggor med IPv6-adresser tillgÃ¤ngliga, men vissa Pluggable\nTransports Ã¤r inte IPv6-kompatibla.\n"
+msgstr "Det finns nÃ¥gra broar med IPv6-adresser tillgÃ¤ngliga, men vissa Pluggable\nTransports Ã¤r inte IPv6-kompatibla.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Dessutom har BridgeDB nÃ¥gra alldeles vanliga bryggor %s utan Pluggable\nTransports %s vilket kanske inte lÃ¥ter sÃ¥ hÃ¤ftigt, men i mÃ¥nga fall kan de \nfortfarande hjÃ¤lpa dig med att kringgÃ¥ internet-censur.\n\n"
+msgstr "Dessutom har BridgeDB nÃ¥gra alldeles vanliga broar %s utan Pluggable\nTransports %s vilket kanske inte lÃ¥ter sÃ¥ hÃ¤ftigt, men i mÃ¥nga fall kan de \nfortfarande hjÃ¤lpa dig med att kringgÃ¥ internet-censur.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "Vad Ã¤r bryggor?"
+msgstr "Vad Ã¤r broar?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bryggor %s Ã¤r Tor-relÃ¤er som hjÃ¤lper dig kringgÃ¥ censur."
+msgstr "%s Broar %s Ã¤r Tor-relÃ¤er som hjÃ¤lper dig kringgÃ¥ censur."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa bryggor pÃ¥!"
+msgstr "Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa broar pÃ¥!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -152,12 +280,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Ett annat sÃ¤tt att fÃ¥ nya broar Ã¤r att skicka e-post till %s. Du mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande e-postleverantÃ¶rer:\n%s, %s eller %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Mina bryggor fungerar inte! Jag behÃ¶ver hjÃ¤lp!"
+msgstr "Mina broar fungerar inte! Jag behÃ¶ver hjÃ¤lp!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Om Tor inte fungerar fÃ¶r dig sÃ¥ kan du e-posta %s."
@@ -165,225 +293,100 @@ msgstr "Om Tor inte fungerar fÃ¶r dig sÃ¥ kan du e-posta %s."
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "FÃ¶rsÃ¶k att berÃ¤tta sÃ¥ mycket om problemet som du kan, bland annat vilka\nbryggor och Pluggable Transports som du fÃ¶rsÃ¶kt anvÃ¤nda, vilken version av Tor Browser du anvÃ¤nder, vilka felmeddelanden som Tor visat, etc."
+msgstr "FÃ¶rsÃ¶k att berÃ¤tta sÃ¥ mycket om problemet som du kan, bland annat vilka\nbroar och Pluggable Transports som du fÃ¶rsÃ¶kt anvÃ¤nda, vilken version av Tor Browser du anvÃ¤nder, vilka felmeddelanden som Tor visat, etc."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "HÃ¤r Ã¤r dina rader med bryggor:"
+msgstr "HÃ¤r Ã¤r dina rader med broar:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "Skaffa Bryggor!"
+msgstr "Skaffa broar!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "VÃ¤lj alternativ fÃ¶r typ av brygga:"
+msgstr "VÃ¤lj alternativ fÃ¶r typ av bro:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "BehÃ¶ver du en IPv6-adress?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "BehÃ¶ver du %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Din webblÃ¤sare visar inte bilder korrekt."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Skriv in tecknen frÃ¥n bilden ovan..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "Hur du bÃ¶rjar anvÃ¤nda dina bryggor"
+msgstr "Hur du bÃ¶rjar anvÃ¤nda dina broar"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "FÃ¶r att ange bryggor i Tor Borwser, gÃ¥ till nedladdningssidan %s Tor Browser %s och fÃ¶lj instruktionerna fÃ¶r att ladda ner och starta Tor Browser."
+msgstr "FÃ¶r att ange broar i Tor Browser, gÃ¥ till %s hÃ¤mtningssidan fÃ¶r Tor Browser %s och fÃ¶lj instruktionerna fÃ¶r att hÃ¤mta och starta Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blockerar eller filtrerar din InternetleverantÃ¶r (ISP) anslutningar till Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "VÃ¤lj 'Ja' och klicka sedan pÃ¥ 'NÃ¤sta'. FÃ¶r att konfigurera nya bryggor, kopiera och klistra in bryggraderna 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."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Visa detta meddelande."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "Leta efter vanliga bryggor."
+msgstr "Leta efter vanliga broar."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "BegÃ¤r IPv6-bryggor"
+msgstr "BegÃ¤r IPv6-broar"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 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".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "HÃ¤mta en kopia av BridgeDB:s publika GnuPG-nyckel."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapportera en bugg"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "KÃ¤llkod"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ã?ndringslogg"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Markera Allt"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Visa QR-kod"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-kod fÃ¶r dina rader med bryggor"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Bomber och granater, nÃ¥t gick snett!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det verkar som att ett fel orsakade problem att fÃ¥ din QR-kod."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Denna QR-kod innehÃ¥ller dina rader med bryggor. Skanna den med en QR-kodlÃ¤sare fÃ¶r att kopiera dina rader med bryggor till mobila och andra enheter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "FÃ¶r nÃ¤rvarande finns inga bryggor tillgÃ¤ngliga..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Prova att %s gÃ¥ tillbaka %s fÃ¶r att vÃ¤lja en annan typ av brygga!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Steg %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ladda ner %s Tor Browser  %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Steg %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Skaffa %s bryggor %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Steg %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nu kan du %s lÃ¤gga till bryggor i Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sG%se mig bryggor!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Avancerade instÃ¤llningar"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nej"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sÃ¤mta Bridges"
diff --git a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
index 94444e6..855f43c 100644
--- a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,25 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Anto Sujesh <sujeshantoj@xxxxxxxxx>, 2015
+# deadrat <jayabharat@xxxxxxxx>, 2017
+# Ephraim Raj <ephraimraj11299@xxxxxxxxx>, 2016
 # git12a <git12@xxxxxxxxxxxxxxx>, 2015
+# Senthil Kumar <paranthaba@xxxxxxxxx>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-02-13 10:18+0000\n"
-"Last-Translator: git12a <git12@xxxxxxxxxxxxxxx>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,57 +34,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "à®®à®©à¯?à®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?! à®?à®?à¯?à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®?à¯?à®³à®¿à®±à¯?à®?à¯? à®?à®¤à¯?à®?à®°à¯?  à®¤à®µà®±à¯? à®¨à¯?à®°à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "à®?à®°à¯? à®ªà®¿à®´à¯?à®¯à¯? à®?à®±à®¿à®?à¯?à®?à¯?à®?à¯?à®¯à¯?à®?"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "à®®à¯?à®² à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯?"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "à®®à®¾à®±à¯?à®±à®®à¯?à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¾à®ªà¯?à®ªà¯?"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®³à¯?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à®?à®©à¯?à®¤à¯?à®¤à¯?à®¯à¯?à®®à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®¾à®£à¯?à®ªà®¿ "
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®¯ bridge à®µà®°à®¿à®?à®³à¯?à®?à¯?à®?à®¾à®© QRCode"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr " à®?à®¯à®?à¯?, à®ªà®¿à®°à®?à¯?à®?à®©à¯?!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "à®?à¯?à®¯à¯? à®?à®°à¯? à®?à¯?à®±à®¿à®¯à¯?à®?à¯? à®?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à®?à®¨à¯?à®¤ QRCode à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³à®¤à¯?. à®?à¯?à®²à¯?à®²à®¿à®?à®ªà¯?à®?à®¿ à®®à®±à¯?à®±à¯?à®®à¯? à®µà¯?à®±à¯? à®?à®¾à®¤à®©à®?à¯?à®?à®³à®¿à®²à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à®³à¯? à®¨à®¿à®°à®²à¯?à®?à¯?à®?à¯?à®? QRCode à®µà®¾à®?à®¿à®ªà¯?à®ªà®¾à®©à¯? à®®à¯?à®²à®®à¯? à®?à®¤à¯? à®?à®?à¯?à®±à¯?à®µà®¿ à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "à®¤à®±à¯?à®?à®®à®¯à®®à¯? Bridge-à®?à®³à¯? à®¯à¯?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à®?à®°à¯?à®µà¯?à®³à¯? à®¨à¯?à®?à¯?à®?à®³à¯? %s à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®? à®ªà®¿à®©à¯?à®©à¯? à®?à¯?à®©à¯?à®±à¯? %s à®µà¯?à®±à¯?à®°à¯? à®µà®?à¯? à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?à®¯à®²à®¾à®®à¯?!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à®?à®?à®¿ %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®µà¯?à®®à¯? %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à®?à®?à®¿ %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Bridge-à®?à®³à¯? %s à®ªà¯?à®±à¯?à®?"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "à®?à®?à®¿ %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sà®¨à¯?%sà®°à®¯à®?à®¿à®¯à®¾à®? bridge-à®?à®³à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "à®®à¯?à®®à¯?à®ªà®?à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "à®?à®²à¯?à®²à¯?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "à®?à®¤à¯?à®µà¯?à®®à®¿à®²à¯?à®²à¯?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sà®?%sà®®à¯?!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sà®ªà¯?%sà®°à¯?à®? Bridge-à®?à®³à¯?"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[ à®?à®¤à¯? à®?à®°à¯? à®¤à®¾à®©à®¿à®¯à®?à¯?à®?à®¿ à®?à¯?à®¯à¯?à®¤à®¿; à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? à®ªà®¤à®¿à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®µà¯?à®£à¯?à®?à®¾à®®à¯?.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridges:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "à®¨à¯?à®?à¯?à®?à®³à¯? à®µà¯?à®¤ à®µà®°à®®à¯?à®ªà¯? à®®à¯?à®±à®¿ à®µà®¿à®?à¯?à®?à¯?à®°à¯?à®?à®³à¯?. à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®¤à¯?à®µà®?à¯?à®¯à®µà¯?à®®à¯?! à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à®¿à®©à¯? à®?à®?à¯?à®¯à¯? à®?à¯?à®±à¯?à®¨à¯?à®¤à®ªà®?à¯?à®? à®¨à¯?à®°à®®à¯? %s à®®à®£à®¿à®?à®³à¯?. à®?à®¨à¯?à®¤ à®¨à¯?à®°à®¤à¯?à®¤à®¿à®©à¯?à®³à¯? à®?à®©à¯?à®¤à¯?à®¤à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯?à®®à¯?  à®¨à®¿à®°à®¾à®?à®°à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®®à¯?."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à®³à¯?: (à®ªà®² à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®? à®?à®?à¯?à®?à®³à¯?à®?à®³à¯? à®?à®°à¯?à®?à®®à®¯à®¤à¯?à®¤à®¿à®²à¯? à®?à®©à¯?à®±à®¿à®¯à®¿à®©à¯?à®?à®µà¯?à®®à¯?)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB-à®¯à®¿à®©à¯?à®³à¯? à®¨à®²à¯?à®µà®°à®µà¯?"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "à®¤à®±à¯?à®ªà¯?à®¾à®¤à¯? à®?à®¤à®°à®µà¯? à®?à®³à¯?à®³ Transport TYPE-à®?à®³à¯? "
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "à®¹à¯?, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "à®¹à®²à¯?à®¾, à®¤à¯?à®´à®¾!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "à®ªà¯?à®¾à®¤à¯? à®?à®¾à®µà®¿à®?à®³à¯?"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +220,7 @@ msgstr "à®?à®¨à¯?à®¤ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®µà®¾à®©à®µà®¿à®²à¯?, à®¯
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +231,7 @@ msgid ""
 msgstr "BridgeDB-à®¯à®¾à®²à¯? %sà®ªà®²à®µà®?à¯?à®¯à®¾à®© Pluggable Transports%s bridge-à®?à®³à¯? à®¤à®°à®®à¯?à®?à®¿à®¯à¯?à®®à¯?,\nà®?à®µà¯? à®?à®?à¯?à®?à®³à¯? Tor Network à®?à®£à¯?à®ªà¯?à®ªà¯?à®?à®³à¯? à®µà®¿à®³à®?à¯?à®?à®¾à®¤à®µà®£à¯?à®£à®®à¯? à®?à®?à¯?à®?à®µà¯?à®¤à®µà®¿, à®?à®?à¯?à®?à®³à®¿à®©à¯? \nà®?à®£à¯?à®¯ à®ªà¯?à®¾à®?à¯?à®?à¯?à®µà®°à®¤à¯?à®¤à¯? à®?à®£à¯?à®?à®¾à®©à®¿à®ªà¯?à®ªà®µà®°à¯?à®?à¯?à®?à¯? à®¨à¯?à®?à¯?à®?à®³à¯? Tor à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à¯?à®°à¯?à®?à®³à¯? à®?à®©à®?à¯?à®?à®©à¯?à®?à®±à®¿à®¯ à®®à¯?à®²à¯?à®®à¯?\nà®?à®?à®¿à®©à®®à¯? à®?à®?à¯?à®?à¯?à®®à¯?.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -114,7 +243,7 @@ msgstr "à®?à®¿à®² IPv6 à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯?à®£à¯?à®? bridge-à®?à®³à¯?
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +252,20 @@ msgid ""
 "\n"
 msgstr "à®?à¯?à®?à¯?à®¤à®²à®¾à®?, BridgeDB-à®¯à®¿à®©à¯?à®³à¯? à®?à®°à®¾à®³à®®à®¾à®© à®ªà®´à¯?à®¯à®®à¯?à®±à¯? bridge-à®?à®³à¯? \n%s Pluggable Transports à®µà®?à®¤à®¿à®¯à®¿à®²à¯?à®²à®¾à®®à®²à¯? à®?à®³à¯?à®³à®¤à¯? %s à®?à®£à®°à¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®?à¯?à®?à®¿à®±à®µà®¾à®±à¯? à®?à®²à¯?à®²à®¾à®µà®¿à®?à¯?à®?à®¾à®²à¯?à®®à¯?, \nà®?à®µà¯?à®¯à®¾à®²à¯? à®ªà®² à®?à®¨à¯?à®¤à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à®¿à®²à¯? à®?à®©à¯?à®¯ à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à¯? à®?à®?à®?à¯?à®? à®?à®¤à®µà¯?à®®à¯?.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Bridges à®?à®©à¯?à®±à®¾à®²à¯? à®?à®©à¯?à®©?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridge-à®?à®³à¯? %s à®?à®©à¯?à®®à¯? Tor Relay-à®?à®³à¯? à®¤à®£à®¿à®?à¯?à®?à¯?à®¯à¯? à®?à®?à®?à¯?à®?  à®?à®¤à®µà¯?à®®à¯?"
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "à®?à®©à®?à¯?à®?à¯? Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®°à¯? à®®à®¾à®±à¯?à®±à¯? à®µà®´à®¿ à®µà¯?à®£à¯?à®?à¯?à®®à¯?"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +273,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®°à¯? à®®à®¾à®±à¯?à®±à¯?à®µà®´à®¿ %s à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯?   à®?à®°à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯?.\nà®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¯à®¤à¯? à®?à®µà®©à®¿à®?à¯?à®?à®µà¯?à®®à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à®?à¯?à®?à®¾à®¯à®®à®¾à®? à®?à¯?à®´à¯?à®?à®£à¯?à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®µà¯?à®?à®³à®¿à®©à¯? à®®à¯?à®?à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà®²à®¾à®®à¯? :\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "à®?à®©à¯? Bridge-à®?à®³à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯?! à®?à®©à®?à¯?à®?à¯? à®?à®¤à®µà®¿ à®¤à¯?à®µà¯?!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "à®?à®?à¯?à®?à®³à¯? Tor à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯? à®?à®©à®¿à®²à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? %s à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à¯?à®³à¯?à®?  "
@@ -157,70 +286,71 @@ msgstr "à®?à®?à¯?à®?à®³à¯? Tor à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®µà®¿à®²à¯?à®²à¯? 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "à®?à®?à¯?à®?à®³à¯? à®µà®´à®?à¯?à®?à¯? à®?à¯?à®±à®¿à®¤à¯?à®¤à¯? à®?à®¤à®¿à®?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à®³à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®³à¯?, à®?à®¤à®¿à®²à¯? à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®¯à®±à¯?à®?à®¿à®¤à¯?à®¤ bridges\nà®®à®±à¯?à®±à¯?à®®à¯? Pluggable Transports, à®¤à®?à¯?à®?à®³à®¿à®©à¯? Tor Browser à®ªà®¤à®¿à®ªà¯?à®ªà¯? à®?à®£à¯? à®?à®?à®¿à®¯à®µà¯? à®?à®?à®?à¯?à®?à¯?à®®à¯?, à®®à®±à¯?à®±à¯?à®®à¯? Tor\nà®?à¯?à®°à®¿à®¯à®¤à®?à®µà®²à¯?à®?à®³à¯? à®ªà¯?à®¾à®©à¯?à®±à®µà®±à¯?à®±à¯?à®¯à¯?à®®à¯? à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? bridge à®µà®°à®¿à®?à¯?à®?à®³à¯?: "
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Bridge-à®?à®³à¯? à®ªà¯?à®±à¯?à®?!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Bridge à®µà®?à¯? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? IPv6 à®®à¯?à®?à®µà®°à®¿à®?à®³à¯? à®µà¯?à®£à¯?à®?à¯?à®®à®¾?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®°à¯? %s à®¤à¯?à®µà¯?à®¯à®¾?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr " à®¤à®?à¯?à®?à®³à®¿à®©à¯? browser à®ªà®?à®?à¯?à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®? à®?à®¾à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "à®®à¯?à®²à¯? à®?à®³à¯?à®³ à®ªà®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®°à¯?à®?à¯?à®?à¯?à®®à¯? à®?à®´à¯?à®¤à¯?à®¤à¯?à®?à¯?à®?à®³à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "à®¤à®?à¯?à®?à®³à®¿à®©à¯? bridge-à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®¤à¯?à®¾à®?à®?à¯?à®?à¯?à®µà®¤à¯? à®?à®ªà¯?à®ªà®?à®¿"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "Bridge-à®?à®³à¯? Tor Browser-à®©à¯?à®³à¯? à®?à®³à¯?à®³à®¿à®?, %s Tor Browser à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?à®¤à®¿à®²à¯? %s à®?à®³à¯?à®³ à®µà®´à®¿à®®à¯?à®±à¯?à®?à®³à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à®¿ Tor Browser-à®? à®¤à¯?à®¾à®?à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. "
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Tor à®?à®²à®¾à®µà®¿à®¯à®¿à®²à¯? bridgeà®?à®³à¯? à®?à®³à¯?à®³à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯, à®®à¯?à®¤à®²à®¿à®²à¯? %s Tor à®?à®²à®¾à®µà®¿ à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à¯? à®?à¯?à®©à¯?à®±à¯? %s à®®à¯?à®²à¯?à®®à¯? à®ªà®¿à®±à®?à¯? à®?à®?à¯?à®?à¯? Tor à®?à®²à®¾à®µà®¿à®¯à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®¤à¯?à®?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®?à®±à®¿à®µà¯?à®±à¯?à®¤à¯?à®¤à®²à¯?à®?à®³à¯? à®ªà®¿à®©à¯?à®ªà®±à¯?à®±à¯?à®?à¯?à®?à®³à¯?."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "à®?à®?à¯?à®?à®³à®¿à®©à¯? à®?à®£à¯?à®¯ à®?à¯?à®µà¯? à®µà®´à®?à¯?à®?à¯?à®®à¯? (ISP) à®¨à®¿à®±à¯?à®µà®©à®®à¯? Tor à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®¤à®?à¯?à®?à¯?à®?à®¿à®±à®¤à®¾ à®?à®²à¯?à®²à®¤à¯? \nà®µà¯?à®±à¯?à®µà®´à®¿à®¯à®¿à®²à¯? à®¤à®£à®¿à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à®¾? "
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,130 +358,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "'à®?à®®à¯?' à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®¤à¯?à®¤à¯? à®ªà®¿à®©à¯?à®©à®°à¯? 'à®?à®?à¯?à®¤à¯?à®¤à¯?' à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®¤à®?à¯?à®?à®³à®¿à®©à¯? à®ªà¯?à®¤à®¿à®¯ bridge-à®?à®³à¯? à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?, \nà®µà®°à®¿à®?à¯?à®?à®³à¯? à®µà®¾à®?à¯?à®?à®¿à®¯à®®à¯? à®?à®³à¯?à®³à¯?tà®?à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¨à®?à®²à¯?à®?à®?à¯?à®¤à¯?à®¤à¯?  à®ªà¯?à®¸à¯?à®?à¯? à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?. à®?à®±à¯?à®¤à®¿à®¯à®¾à®?, 'à®?à®£à¯?à®?à¯?à®?' à®?à®¿à®³à®¿à®?à¯? \nà®?à¯?à®¯à¯?à®¤à®µà¯?à®?à®©à¯?, à®¨à¯?à®?à¯?à®?à®³à¯? à®?à¯?à®²à¯?à®² à®¤à®¯à®¾à®°à¯?! à®¨à¯?à®?à¯?à®?à®³à¯? à®ªà®¿à®°à®?à¯?à®?à®¿à®©à¯?à®¯à¯? à®?à®¨à¯?à®¤à®¿à®¤à¯?à®¤à®¾à®²à¯?, 'Tor à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯? à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?' \nà®µà®´à®¿à®?à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ 'à®?à®¤à®µà®¿' à®ªà¯?à®¾à®¤à¯?à®¤à®¾à®©à¯?  à®?à®¿à®³à®¿à®?à¯? à®?à¯?à®¯à¯?à®¤à¯? à®®à¯?à®²à¯?à®®à¯? à®?à®¤à®µà®¿ à®ªà¯?à®±à®µà¯?à®®à¯?."
 
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®¾à®?à¯?à®?à®µà¯?à®®à¯? "
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "à®ªà®´à¯?à®¯à®®à¯?à®±à¯?à®¯à®¾à®© bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPv6 bridge-à®?à®³à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Pluggable Transport bridge-à®?à®³à¯? TYPE à®µà®?à¯?à®¯à®¿à®²à¯? à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®¿à®?à¯?à®?à®µà¯?à®®à¯?."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr " BridgeDB-à®¯à¯?à®?à¯?à®¯ à®ªà¯?à®¾à®¤à¯? GnuPG à®?à®¾à®µà®¿à®¯à®¿à®©à¯? à®?à®°à¯? à®¨à®?à®²à¯? à®ªà¯?à®±à®µà¯?à®®à¯?."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "à®?à®°à¯? à®ªà®¿à®´à¯?à®¯à¯? à®?à®±à®¿à®?à¯?à®?à¯?à®?à¯?à®¯à¯?à®?"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "à®®à¯?à®² à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯?"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "à®®à®¾à®±à¯?à®±à®®à¯?à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¾à®ªà¯?à®ªà¯?"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®³à¯?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
-msgid "Uh oh, spaghettios!"
-msgstr " à®¹à¯?, à®ªà®¿à®°à®?à¯?à®?à®©à¯?!"
-
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "à®¤à®±à¯?à®?à®®à®¯à®®à¯? Bridge-à®?à®³à¯? à®¯à¯?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "à®?à®°à¯?à®µà¯?à®³à¯? à®¨à¯?à®?à¯?à®?à®³à¯? %s à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®? à®ªà®¿à®©à¯?à®©à¯? à®?à¯?à®©à¯?à®±à¯? %s à®µà¯?à®±à¯?à®°à¯? à®µà®?à¯? à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?à®¯à®²à®¾à®®à¯?!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "à®?à®?à®¿ %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®µà¯?à®®à¯? %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "à®?à®?à®¿ %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Bridge-à®?à®³à¯? %s à®ªà¯?à®±à¯?à®?"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "à®?à®?à®¿ %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "à®?à®ªà¯?à®ªà¯?à®´à¯?à®¤à¯? %s bridge-à®?à®³à¯? Tor Browser-à®?à®³à¯? %s à®?à¯?à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sà®¨à¯?%sà®°à®¯à®?à®¿à®¯à®¾à®? bridge-à®?à®³à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "à®®à¯?à®®à¯?à®ªà®?à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "à®?à®²à¯?à®²à¯?"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sà®?%sà®®à¯?!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sà®ªà¯?%sà®°à¯?à®? Bridge-à®?à®³à¯?"
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index 978655e..bc6080f 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -1,27 +1,23 @@
 # Translations template for BridgeDB.
 # Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
-# Isis Lovecruft <isis@xxxxxxxxxxxxxx>, 2015.
-#
-#, fuzzy
-#
+# 
 # Translators:
-# runasand <runa.sandvik@xxxxxxxxx>, 2011
-# Isis Lovecruft <isis@xxxxxxxxxxxxxx>, 2012-2015
+# runasand <inactive+runasand@xxxxxxxxxxxxx>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: bridgedb 0.3.1+255.g3454779.dirty\n"
-"Report-Msgid-Bugs-To: "
-"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords";
-"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2017-09-19 09:41+0000\n"
+"Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>\n"
+"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -36,35 +32,35 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr ""
+msgstr "Sorry! Something went wrong with your request."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr ""
+msgstr "Report a Bug"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
-msgstr ""
+msgstr "Source Code"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr ""
+msgstr "Changelog"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "Select All"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Show QRCode"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "QRCode for your bridge lines"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -73,56 +69,58 @@ msgstr ""
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "Uh oh, spaghettios!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "It seems there was an error getting your QRCode."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy "
-"your bridge lines onto mobile and other devices."
-msgstr ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr ""
+msgstr "There currently aren't any bridges available..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format
-msgid " Perhaps you should try %s going back %s and choosing a different bridge type!"
-msgstr ""
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
-msgstr ""
+msgstr "Step %s1%s"
 
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr ""
+msgstr "Download %s Tor Browser %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
-msgstr ""
+msgstr "Step %s2%s"
 
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr ""
+msgstr "Get %s bridges %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
-msgstr ""
+msgstr "Step %s3%s"
 
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
+msgstr "Now %s add the bridges to Tor Browser %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -131,19 +129,19 @@ msgstr ""
 #: bridgedb/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr ""
+msgstr "%sJ%sust give me bridges!"
 
 #: bridgedb/https/templates/options.html:51
 msgid "Advanced Options"
-msgstr ""
+msgstr "Advanced Options"
 
 #: bridgedb/https/templates/options.html:86
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: bridgedb/https/templates/options.html:87
 msgid "none"
-msgstr ""
+msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -151,7 +149,7 @@ msgstr ""
 #: bridgedb/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
-msgstr ""
+msgstr "%sY%ses!"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -159,50 +157,50 @@ msgstr ""
 #: bridgedb/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr ""
+msgstr "%sG%set Bridges"
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+msgstr "[This is an automated message; please do not reply.]"
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr ""
+msgstr "Here are your bridges:"
 
 #: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
-"emails is %s hours. All further emails during this time period will be "
-"ignored."
-msgstr ""
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
 
 #: bridgedb/strings.py:50
-msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr ""
+msgstr "Welcome to BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr ""
+msgstr "Currently supported transport TYPEs:"
 
 #: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr ""
+msgstr "Hey, %s!"
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr ""
+msgstr "Hello, friend!"
 
 #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr ""
+msgstr "Public Keys"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
@@ -212,7 +210,7 @@ msgstr ""
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr ""
+msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -223,11 +221,10 @@ msgstr ""
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
 "which can help obfuscate your connections to the Tor Network, making it more\n"
-"difficult for anyone watching your internet traffic to determine that you are"
-"\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr ""
+msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -235,7 +232,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr ""
+msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -245,45 +242,42 @@ msgstr ""
 #: bridgedb/strings.py:88
 #, python-format
 msgid ""
-"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any"
-"\n"
-"Pluggable Transports %s which maybe doesn't sound as cool, but they can still"
-"\n"
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr ""
+msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr ""
+msgstr "What are bridges?"
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "I need an alternative way of getting bridges!"
 
 #: bridgedb/strings.py:108
 #, python-format
 msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you "
-"must\n"
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr ""
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "My bridges don't work! I need help!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr ""
+msgstr "If your Tor doesn't work, you should email %s."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -293,40 +287,40 @@ msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr ""
+msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
 
 #: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Here are your bridge lines:"
 
 #: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr ""
+msgstr "Get Bridges!"
 
 #: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr ""
+msgstr "Please select options for bridge type:"
 
 #: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr ""
+msgstr "Do you need IPv6 addresses?"
 
 #: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr ""
+msgstr "Do you need a %s?"
 
 #: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr ""
+msgstr "Your browser is not displaying images properly."
 
 #: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr ""
+msgstr "Enter the characters from the image above..."
 
 #: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr ""
+msgstr "How to start using your bridges"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #: bridgedb/strings.py:146
@@ -335,57 +329,53 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr ""
+msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151
 msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and "
-"follow\n"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr ""
+msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:155
 msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor "
-"connections\n"
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr ""
+msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and"
-"\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr ""
+msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
 
 #: bridgedb/strings.py:167
 msgid "Displays this message."
-msgstr ""
+msgstr "Displays this message."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
 #: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr ""
+msgstr "Request vanilla bridges."
 
 #: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr ""
+msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr ""
+msgstr "Request a Pluggable Transport by TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
 #: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr ""
-
+msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
index 23c5743..0dd1a08 100644
--- a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
@@ -8,25 +8,32 @@
 # Emir SarÄ± <bitigchi@xxxxxxxxxxxxxxx>, 2014
 # Emre <conan@xxxxxxxxxxxxx>, 2013
 # erg26 <ergungorler@xxxxxxxxx>, 2012
+# erg26 <ergungorler@xxxxxxxxx>, 2012
+# eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
 # Fomas <fomas.adana@xxxxxxxxx>, 2015
-# Idil Yuksel <perfectionne@xxxxxxxxx>, 2014
+# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
+# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015-2016,2018-2019
+# Ozancan KarataÅ? <ozancankaratas96@xxxxxxxxxxx>, 2015
+# ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
+# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
 # Sercan AltundaÅ? <>, 2012
 # ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
 # Tekel Bira <psycookie@xxxxxxxxx>, 2012
-# Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2015
+# Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2016
+# zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
 # zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-20 14:58+0000\n"
-"Last-Translator: Fomas <fomas.adana@xxxxxxxxx>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-09 02:36+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren@xxxxxxxxx>\n"
+"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -41,68 +48,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Ã?zgÃ¼nÃ¼z! Ä°steÄ?inizle ilgili bir hata oluÅ?tu."
+msgstr "Ã?zgÃ¼nÃ¼z! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Bir Hata Bildirin"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kaynak Kodu"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "SÃ¼rÃ¼m NotlarÄ±"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ä°letiÅ?im"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "TÃ¼mÃ¼nÃ¼ SeÃ§"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Kodunu GÃ¶rÃ¼ntÃ¼le"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Haydi hayÄ±rlÄ±sÄ±!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR Kodunuzun alÄ±nmasÄ±nda bir sorun Ã§Ä±kmÄ±Å? gibi gÃ¶rÃ¼nÃ¼yor."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Bu QR Kodunda kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z bulunuyor. KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ± bir mobil aygÄ±ta ya da baÅ?ka aygÄ±tlara kopyalamak iÃ§in bu kodu bir QR Kodu tarayÄ±cÄ±sÄ±na okutun."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Å?u anda kullanÄ±labilecek bir kÃ¶prÃ¼ yok..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Belki %s geri dÃ¶nmeyi %s ve farklÄ± bir kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§meyi denemelisiniz!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s. AdÄ±m"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser UygulamasÄ±nÄ± %s indirin"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s. AdÄ±m"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s KÃ¶prÃ¼leri %s edinin"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s. AdÄ±m"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Å?imdi %s Tor Browser Ã¼zerine kÃ¶prÃ¼ler ekleyin %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sana sadece kÃ¶prÃ¼leri verin!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "GeliÅ?miÅ? Ayarlar"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "HayÄ±r"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "hiÃ§biri"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sE%svet!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%sÃ¶prÃ¼leri Al"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu otomatik bir mesajdÄ±r; lÃ¼tfen yanÄ±tlamayÄ±nÄ±z.]"
+msgstr "[Bu otomatik bir iletidir; lÃ¼tfen yanÄ±tlamayÄ±n.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ä°Å?te kÃ¶prÃ¼leriniz:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "E-posta kotanÄ±zÄ± aÅ?tÄ±nÄ±z. LÃ¼tfen yavaÅ?layÄ±n! E-postalar arasÄ±ndaki minimum zaman %s saattir.\nBu sÃ¼re iÃ§inde gÃ¶ndereceÄ?iniz diÄ?er e-postalarÄ±nÄ±z yok sayÄ±lacaktÄ±r."
+msgstr "E-posta sÄ±nÄ±rÄ±nÄ±zÄ± aÅ?tÄ±nÄ±z. LÃ¼tfen yavaÅ?layÄ±n! E-postalar arasÄ±ndaki en az zaman %s saattir.\nBu sÃ¼re iÃ§inde gÃ¶ndereceÄ?iniz diÄ?er e-postalarÄ±nÄ±z gÃ¶zardÄ± edilecektir."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMUTlar: (birden fazla seÃ§eneÄ?Ä± aynÄ± anda belirtmek iÃ§in KOMUTlarÄ± birleÅ?tirin)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB'ye HoÅ? Geldiniz!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Å?u an desteklenen taÅ?Ä±yÄ±cÄ± TYPElarÄ±:"
+msgstr "Å?u an desteklenen aktarÄ±m TÃ?Rleri:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Selam, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Selam, arkadaÅ?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
-msgstr "AÃ§Ä±k Anahtarlar"
+msgstr "Herkese AÃ§Ä±k Anahtarlar"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Bu e-posta %s iÃ§in %s tarihinde %s saatinde gÃ¶kkuÅ?aklarÄ±,\ntek boynuzlu atlar ve pÄ±rÄ±ltÄ±larla oluÅ?turulmuÅ?tur."
+msgstr "Bu e-posta %s iÃ§in %s %s tarihinde gÃ¶kkuÅ?aklarÄ±, tek boynuzlu atlar\nve Ä±Å?Ä±ltÄ±larla oluÅ?turuldu."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -110,283 +242,158 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB, birÃ§ok %stÃ¼r Eklenebilir AktarÄ±mlar%s iÃ§eren\nkÃ¶prÃ¼ saÄ?layabilir.\nBu Å?ekilde Ä°nternet trafiÄ?inizi izleyen birinin Tor kullandÄ±Ä?Ä±nÄ±zÄ±\nanlamasÄ±nÄ± zorlaÅ?tÄ±rmak iÃ§in Tor AÄ?Ä±'na yaptÄ±Ä?Ä±nÄ±z\nbaÄ?lantÄ±larÄ± karÄ±Å?tÄ±rmanÄ±za yardÄ±mcÄ± olabilir.\n\n"
+msgstr "BridgeDB, Ã§eÅ?itli %stÃ¼rde DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar%s iÃ§eren kÃ¶prÃ¼ler saÄ?layabilir.\nBÃ¶ylece Tor AÄ?Ä± Ã¼zerine yaptÄ±Ä?Ä±nÄ±z baÄ?lantÄ±lar karÄ±Å?tÄ±rÄ±larak, Ä°nternet trafiÄ?inizi\nizleyen birinin Tor kullandÄ±Ä?Ä±nÄ±zÄ± anlamasÄ± zorlaÅ?tÄ±rÄ±labilir.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "IPv6 kullanan bazÄ± kÃ¶prÃ¼ler de mevcut olmasÄ±nÄ±n yanÄ±nda bazÄ± Eklenebilir AktarÄ±mlar\nIPv6 uyumlu deÄ?ildir.\n\n"
+msgstr "IPv6 kullanan bazÄ± kÃ¶prÃ¼ler olmasÄ±na raÄ?men bazÄ± DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar\nIPv6 ile uyumlu deÄ?ildir.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ek olarak BridgeDB %s hiÃ§bir Eklenebilir AktarÄ±ma sahip olmayan %s birÃ§ok dÃ¼z\nÃ¶zelliksiz kÃ¶prÃ¼ye sahiptir. AdlarÄ± hoÅ? olmayabilir ancak hala Ã§oÄ?u durumda sansÃ¼rÃ¼\naÅ?maya yardÄ±m edebilirler.\n\n"
+msgstr "AyrÄ±ca BridgeDB %s Ã¼zerinde herhangi bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± kullanmayan %s birÃ§ok eski, sÄ±radan\nve Ã¶zelliksiz vanilla kÃ¶prÃ¼sÃ¼ bulunur. KulaÄ?a pek iyi gelmeyebilir ancak bu kÃ¶prÃ¼ler hala pek Ã§ok\ndurumda Ä°nternet engellemelerini aÅ?makta yardÄ±mcÄ± olabilir.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "KÃ¶prÃ¼ nedir?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s KÃ¶prÃ¼ler %s sansÃ¼rÃ¼ aÅ?manÄ±za yardÄ±mcÄ± olan Tor aktarÄ±cÄ±larÄ±dÄ±r."
+msgstr "%s KÃ¶prÃ¼ler %s Ä°nternet kÄ±sÄ±tlamalarÄ±nÄ± aÅ?manÄ±za yardÄ±mcÄ± olan Tor aktarÄ±cÄ±larÄ±dÄ±r."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "KÃ¶prÃ¼ adresi edinmek iÃ§in baÅ?ka bir yola gereksinimim var!"
+msgstr "KÃ¶prÃ¼leri edinmek iÃ§in baÅ?ka bir yola gerek duyuyorum!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "KÃ¶prÃ¼leri almanÄ±n diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±lardan birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s, %s veya %s."
+msgstr "KÃ¶prÃ¼leri edinmenin diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±larÄ±n birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s, %s ya da %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "KÃ¶prÃ¼lerim Ã§alÄ±Å?mÄ±yor! YardÄ±ma ihtiyacÄ±m var!"
+msgstr "KÃ¶prÃ¼lerim Ã§alÄ±Å?mÄ±yor! YardÄ±m gerek!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor'unuz Ã§alÄ±Å?mÄ±yorsa %s adresine e-posta gÃ¶ndermelisiniz. "
+msgstr "Tor uygulamanÄ±z Ã§alÄ±Å?mÄ±yorsa %s adresine e-posta gÃ¶ndermelisiniz."
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkÄ±nda olabildiÄ?ince fazla bilgi verin.\nÃ?rneÄ?in kullanmaya Ã§alÄ±Å?tÄ±Ä?Ä±nÄ±z Eklenebilir TaÅ?Ä±yÄ±cÄ±lar, Tor Browser sÃ¼rÃ¼mÃ¼nÃ¼z, Tor'un gÃ¶sterdiÄ?i tÃ¼m hata iletileri vb."
+msgstr "Durumunuz hakkÄ±nda olabildiÄ?ince fazla bilgi verin.\nKullanmaya Ã§alÄ±Å?tÄ±Ä?Ä±nÄ±z kÃ¶prÃ¼ listesi ve DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ±lar, Tor Browser sÃ¼rÃ¼mÃ¼nÃ¼z,\nTor tarafÄ±ndan gÃ¶rÃ¼ntÃ¼lenen tÃ¼m iletiler gibi."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ä°Å?te kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "KÃ¶prÃ¼leri Al!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "LÃ¼tfen kÃ¶prÃ¼ tÃ¼rÃ¼ iÃ§in seÃ§enekleri belirleyin:"
+msgstr "LÃ¼tfen kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§eneklerini belirleyin:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "IPv6 adreslerine ihtiyacÄ±nÄ±z var mÄ±?"
+msgstr "IPv6 adresleri gerekli mi?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "%s ihtiyacÄ±nÄ±z var mÄ±?"
+msgstr "%s gerekli mi?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
-msgstr "TarayÄ±cÄ±nÄ±z resimleri dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lemiyor."
+msgstr "TarayÄ±cÄ±nÄ±z gÃ¶rselleri dÃ¼zgÃ¼n gÃ¶rÃ¼ntÃ¼lemiyor."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "YukarÄ±daki gÃ¶rseldeki karakterlerini giriniz..."
+msgstr "YukarÄ±daki gÃ¶rselde bulunan karakterleri yazÄ±n..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "KÃ¶prÃ¼lerinizi kullanmaya nasÄ±l baÅ?larsÄ±nÄ±z"
+msgstr "KÃ¶prÃ¼lerinizi nasÄ±l kullanabilirsiniz"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "Tor Browser'a kÃ¶prÃ¼ tanÄ±mlamak iÃ§in Ã¶nce %s Tor Browser indirme sayfasÄ±na %s gidip, oradaki Tor Browser'Ä± indirme ve baÅ?latma yÃ¶nergelerini izleyin."
+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".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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, 'YapÄ±landÄ±r'Ä± tÄ±klayÄ±n ve Å?unu soruncaya dek\nsihirbazÄ± izleyin:"
+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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Ä°nternet Servis SaÄ?layÄ±cÄ±nÄ±z (ISP) Tor aÄ?Ä±na baÄ?lantÄ±yÄ± engelliyor\nveya baÅ?ka Å?ekillerde sansÃ¼r uyguluyor mu?"
+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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'Evet' ve ardÄ±ndan 'Ä°leri' tÄ±klayÄ±n. Yeni kÃ¶prÃ¼lerinizi yapÄ±landÄ±rmak iÃ§in,\nkÃ¶prÃ¼ satÄ±rlarÄ±nÄ± kopyalayarak metin kutusuna yapÄ±Å?tÄ±rÄ±n. 'BaÄ?lan'Ä± da tÄ±kladÄ±Ä?Ä±nÄ±zda artÄ±k hazÄ±rsÄ±nÄ±z! EÄ?er sorun yaÅ?Ä±yorsanÄ±z, daha fazla yardÄ±m iÃ§in 'Tor AÄ? AyarlarÄ±' sihirbazÄ±ndaki 'YardÄ±m' dÃ¼Ä?mesine tÄ±klamayÄ± deneyin."
+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."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Bu iletiyi gÃ¶rÃ¼ntÃ¼ler."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Normal kÃ¶prÃ¼ler iste."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "IPv6 kÃ¶prÃ¼leri iste."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE uyumlu bir eklenebilir taÅ?Ä±yÄ±cÄ± talep et."
+msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?Ä±yÄ±cÄ± iste."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB'nin ortak GnuPG anahtar kopyasÄ±nÄ± al."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Bir Hata Bildir"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kaynak Kodu"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "DeÄ?iÅ?im gÃ¼nlÃ¼Ä?Ã¼"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Ä°letiÅ?im"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Hepsini SeÃ§"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR Kodunu GÃ¶ster"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±z iÃ§in QR Kodu"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Bu da nesi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "QR Kodunuzu alÄ±nÄ±rken bir hata olmuÅ? gibi gÃ¶rÃ¼nÃ¼yor."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Bu QR Kodu kÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ± iÃ§eriyor. KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ± bir mobil cihaza veya diÄ?er cihazlara kopyalamak iÃ§in bir QR TarayÄ±cÄ± kullanÄ±n."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Å?u anda kullanÄ±labilecek bir kÃ¶prÃ¼ yok..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Belki %s geri dÃ¶nmeyi %s ve farklÄ± bir kÃ¶prÃ¼ tÃ¼rÃ¼ seÃ§meyi denemelisiniz!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "AdÄ±m %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser'Ä± %s Ä°ndirin"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "AdÄ±m %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s KÃ¶prÃ¼leri %s edinin"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "AdÄ±m %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Å?imdi %s kÃ¶prÃ¼leri Tor TarayÄ±cÄ±'ya ekleyin %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sana kÃ¶prÃ¼leri ver!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ä°leri SeÃ§enekler"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "HayÄ±r"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "KÃ¶prÃ¼leri %sA%sl"
+msgstr "Herkese aÃ§Ä±k BridgeDB GnuPG anahtarÄ±nÄ±n bir kopyasÄ±nÄ± al."
diff --git a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
index 1de17e2..7edd38e 100644
--- a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
@@ -3,26 +3,28 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>, 2019
 # Eugene ghostishev, 2014
 # LinuxChata, 2014-2015
 # Oleksii Golub <sclub2018@xxxxxxxxx>, 2015
 # Oleksii Golub <sclub2018@xxxxxxxxx>, 2013
-# Yasha <yasha88888@xxxxxxxxxxx>, 2015
+# Vira Motorko <ato4ka@xxxx>, 2017
+# f5a88f9e30127107e3f9ea67ac1be70b, 2015
 # Ð?Ð½Ð´Ñ?Ñ?Ð¹ Ð?Ð°Ð½Ð´Ñ?Ñ?Ð° <andriykopanytsia@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-13 17:46+0000\n"
-"Last-Translator: Yasha <yasha88888@xxxxxxxxxxx>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-05 23:58+0000\n"
+"Last-Translator: Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
@@ -35,57 +37,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð¸ Ð¿Ñ?Ð¸Ð½Ð¾Ñ?Ð¸Ð¼Ð¾ Ð½Ð°Ñ?Ñ? Ð²Ð¸Ð±Ð°Ñ?ÐµÐ½Ð½Ñ?! Ð©Ð¾Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð· Ð?Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ð¸Ñ?Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð?Ð¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Ð?Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ð²Ñ?Ñ?"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ð¸ QR-ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð²"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ð?Ñ?Ð°ÐºÐ¾Ñ?!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð?Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ?, Ñ?Ð¾ Ñ?Ñ?Ð°Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ QR-ÐºÐ¾Ð´Ñ?."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð². Ð?Ñ?Ð´Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ð¹Ð¾Ð³Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?Ð¼ Ð´Ð»Ñ? Ð·Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? QR-ÐºÐ¾Ð´Ñ?Ð², Ñ?Ð¾Ð± Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð² Ð½Ð° Ð¼Ð¾Ð±Ñ?Ð»Ñ?Ð½Ñ? Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ð?Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð?Ð°Ð¼ Ñ?Ð»Ñ?Ð´ Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ñ?Ð¸ %s Ð¿Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ð¸Ñ?Ñ? %s Ñ? Ð²Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð½Ñ?Ð¸Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ñ?!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ð¸ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ð?Ñ?"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð¶Ð¾Ð´ÐµÐ½"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ¢%sÐ°Ðº!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Ð¦Ðµ Ð°Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?; Ð±Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð½Ðµ Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ð´Ð°Ð¹Ñ?Ðµ.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ð?Ð°Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð?Ð¸ Ð¿ÐµÑ?ÐµÐ²Ð¸Ñ?Ð¸Ð»Ð¸ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ? Ñ?Ð²Ð¸Ð´ÐºÐ¾Ñ?Ñ?Ñ?. Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ñ?Ð¿Ð¾Ð²Ñ?Ð»Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ñ?Ð½Ñ?Ð¼Ð°Ð»Ñ?Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð¼Ñ?Ð¶\nÐ»Ð¸Ñ?Ñ?Ð°Ð¼Ð¸ %s Ð³Ð¾Ð´Ð¸Ð½. Ð?Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ð»Ñ?Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð² Ñ?ÐµÐ¹ Ð¿ÐµÑ?Ñ?Ð¾Ð´ Ñ?Ð°Ñ?Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ñ? Ñ?Ð³Ð½Ð¾Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð¸: (ÐºÐ¾Ð¼Ð±Ñ?Ð½Ñ?Ð²Ð°Ñ?Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð²ÐºÐ°Ð·Ð°Ð²Ñ?Ð¸ ÐºÑ?Ð»Ñ?ÐºÐ° Ð²Ð°Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð² Ð¾Ð´Ð½Ð¾Ñ?Ð°Ñ?Ð½Ð¾)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ð?Ð°Ñ?ÐºÐ°Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ð¼Ð¾ Ñ? BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Ð£ Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? transport TYPE:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð´Ñ?Ñ?Ð¶Ðµ!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ? ÐºÐ»Ñ?Ñ?Ñ?"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +223,7 @@ msgstr "Ð¦ÐµÐ¹ Ð»Ð¸Ñ?Ñ? Ð±Ñ?Ð² Ð·Ð³ÐµÐ½ÐµÑ?Ð¾Ð²Ð°Ð½Ð¾ Ð· Ñ?Ð°Ð¹Ð´Ñ?Ð³Ð°Ð¼Ð¸, Ñ?
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,44 +231,44 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ?Ð¸Ñ?Ð¸ bridges Ð· Ð´ÐµÐºÑ?Ð»Ñ?ÐºÐ¾Ð¼Ð° %sÑ?Ð¸Ð¿Ð°Ð¼Ð¸ Pluggable Transports%s,\nÑ?ÐºÑ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ð¾Ñ? Ð·Ð²'Ñ?Ð·ÐºÐ¸ Ð· Tor Ð¼ÐµÑ?ÐµÐ¶ÐµÑ?, Ñ?Ð¾ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ñ?Ñ? Ñ?Ð¾Ð±Ð¾Ñ?Ñ?\nÐ´Ð»Ñ? Ñ?Ð¸Ñ?, Ñ?Ñ?Ð¾ Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ñ? Ð?Ð°Ñ? Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ñ?Ð°Ñ?Ñ?Ðº, Ñ?Ð¾Ð± Ð²Ð¸Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸, Ñ?Ð¾ Ð?Ð¸\nÐ²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Tor. \n"
+msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ?Ð¸Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð´ÐµÐºÑ?Ð»Ñ?ÐºÐ¾Ð¼Ð° %sÑ?Ð¸Ð¿Ð°Ð¼Ð¸ Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð²%s,\nÑ?ÐºÑ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ð¾Ñ? Ð·Ð²'Ñ?Ð·ÐºÐ¸ Ð· Ð¼ÐµÑ?ÐµÐ¶ÐµÑ? Tor, Ñ?Ð¾ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ñ?Ñ? Ñ?Ð¾Ð±Ð¾Ñ?Ñ?\nÐ´Ð»Ñ? Ñ?Ð¸Ñ?, Ñ?Ñ?Ð¾ Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ñ? Ð?Ð°Ñ? Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ñ?Ð°Ñ?Ñ?Ðº, Ñ?Ð¾Ð± Ð²Ð¸Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸, Ñ?Ð¾ Ð?Ð¸\nÐ²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Tor. \n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "Ð?ÐµÑ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6, Ñ?Ð°ÐºÐ¾Ð¶ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?, Ñ?Ð¾Ñ?Ð° Ð´ÐµÑ?ÐºÑ? Pluggable\nTransports Ð½Ðµ Ñ?Ñ?Ð¼Ñ?Ñ?Ð½Ñ? Ð· IPv6.\n"
+msgstr "Ð?ÐµÑ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6 Ñ?Ð°ÐºÐ¾Ð¶ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?, Ñ?Ð¾Ñ?Ð° Ð´ÐµÑ?ÐºÑ? Ð²Ñ?Ñ?Ð°Ð²Ð½Ñ?\nÑ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ð¸ Ð½Ðµ Ñ?Ñ?Ð¼Ñ?Ñ?Ð½Ñ? Ð· IPv6.\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Ð?Ñ?Ñ?Ð¼ Ñ?Ð¾Ð³Ð¾, BridgeDB Ð¼Ð°Ñ? Ð±Ð°Ð³Ð°Ñ?Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ·\nPluggable Transports %s, Ñ?ÐºÑ?, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð³Ð°Ñ?Ð½Ð¾, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ \nÐ¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ? Ð² Ð±Ð°Ð³Ð°Ñ?Ñ?Ð¾Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÐ°Ñ?.\n"
+msgstr "Ð?Ñ?Ñ?Ð¼ Ñ?Ð¾Ð³Ð¾, BridgeDB Ð¼Ð°Ñ? Ð±Ð°Ð³Ð°Ñ?Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¸Ñ? Ñ?Ðº Ð´Ð²ÐµÑ?Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² %s Ð±ÐµÐ·\nÐ²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð² %s, Ñ?ÐºÑ?, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð³Ð°Ñ?Ð½Ð¾, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ \nÐ¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ? Ð² Ð±Ð°Ð³Ð°Ñ?Ñ?Ð¾Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÐ°Ñ?.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ð©Ð¾ Ñ?Ð°ÐºÐµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ??"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Ð?Ð¾Ñ?Ñ?Ð¸ %s Ñ? Tor Ñ?ÐµÐ»Ðµ, Ñ?ÐºÑ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð?Ð°Ð¼ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ð¸Ð¹ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +276,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? %s. Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ð¾\nÐ?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð²\nÐ¿Ð¾Ñ?Ð»Ñ?Ð³ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸:\n%s, %s Ð°Ð±Ð¾ %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ?!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ð¯ÐºÑ?Ð¾ Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð°Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð° %s."
@@ -162,48 +289,48 @@ msgstr "Ð¯ÐºÑ?Ð¾ Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐºÐ½Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ?Ðµ Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ Ð?Ð°Ñ? Ð²Ð¸Ð¿Ð°Ð´Ð¾Ðº, Ð² Ñ?Ð¾Ð¼Ñ? Ñ?Ð¸Ñ?Ð»Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº\nbridges Ñ? Pluggable Transports, Ñ?Ð¾ Ð?Ð¸ Ð½Ð°Ð¼Ð°Ð³Ð°Ð»Ð¸Ñ?Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸, Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor,\nÑ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?, Ñ?ÐºÑ? Tor Ð²Ð¸Ð´Ð°Ð²Ð°Ð², Ñ? Ñ?.Ð´."
+msgstr "Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐºÐ½Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ?Ðµ Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ Ð?Ð°Ñ? Ð²Ð¸Ð¿Ð°Ð´Ð¾Ðº, Ð² Ñ?Ð¾Ð¼Ñ? Ñ?Ð¸Ñ?Ð»Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº\nÐ¼Ð¾Ñ?Ñ?Ñ?Ð² Ñ? Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ? Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÑ?Ñ?Ð², Ñ?ÐºÑ? Ð?Ð¸ Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ð»Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸, Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor,\nÑ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?, Ñ?ÐºÑ? Tor Ð²Ð¸Ð´Ð°Ð²Ð°Ð², Ñ? Ñ?.Ð´."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð?Ð°Ñ?Ð¾Ð³Ð¾ Ð¼Ð¾Ñ?Ñ?Ñ?:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ?:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ IPv6?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸ ..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð°Ñ?Ð¸Ð¼Ð¸ Ð¼Ð¾Ñ?Ñ?Ð°Ð¼Ð¸"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,21 +339,21 @@ msgid ""
 msgstr "Ð©Ð¾Ð± Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Tor Browser, Ñ?Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ? Ñ?Ð´Ñ?Ñ?Ñ? Ð½Ð°  %s Ñ?Ñ?Ð¾Ñ?Ñ?Ð½ÐºÑ? Ð·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Tor Browser %s Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ñ?Ð»Ñ?Ð´Ñ?Ð¹Ñ?Ðµ Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð¼ Ð´Ð»Ñ? Ñ?ÐºÐ°Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ?  Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¹ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ð°Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?\nÐ´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -234,153 +361,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? \"Ð¢Ð°Ðº\", Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ñ?\". Ð?Ð»Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¸Ñ? bridges, Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ðµ Ð»Ñ?Ð½Ñ?Ñ? bridge Ñ? Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?. Ð?Ð¾Ñ?Ñ?Ð¼, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?', Ñ?\nÐ²Ñ?Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸! Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ \"Ð?Ð¾Ð²Ñ?Ð´ÐºÐ°\" \nÐ² Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð¾Ð²Ñ? \"Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Tor' Ð´Ð»Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Ð?Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? vanilla bridges."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Pluggable Transport Ð¿Ð¾ TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ ÐºÐ¾Ð¿Ñ?Ñ? Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° Ð´Ð»Ñ? BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ð?Ð¾Ð´"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Ð?Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ð²Ñ?Ñ?"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ð¸ QR-ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð²"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ð?Ð¹-Ð¾Ð¹, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Ð?Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ?, Ð±Ñ?Ð»Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ QR-ÐºÐ¾Ð´."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ð¦Ðµ QR-ÐºÐ¾Ð´ Ð¼Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð². Ð?Ñ?Ð´Ñ?ÐºÐ°Ð½Ñ?Ð¹Ñ?Ðµ Ð¹Ð¾Ð³Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?Ð¼ Ð´Ð»Ñ? Ð·Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? QR-ÐºÐ¾Ð´Ñ?Ð², Ñ?Ð¾Ð± Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð?Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ?Ñ?Ð² Ð½Ð° Ð¼Ð¾Ð±Ñ?Ð»Ñ?Ð½Ñ? Ñ?Ð° Ñ?Ð½Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¾Ñ?."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð² ..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ð?Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð?Ð°Ð¼ Ñ?Ð»Ñ?Ð´ Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð²Ð°Ñ?Ð¸ %s Ð¿Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ð¸Ñ?Ñ? %s Ñ? Ð²Ð¸Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð½Ñ?Ð¸Ð¹ Ñ?Ð¸Ð¿ Ð¼Ð¾Ñ?Ñ?Ñ?!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Ð?Ñ?Ð¾Ðº %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ð?Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Ð?Ñ?Ð¾Ðº %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ %s Ð¼Ð¾Ñ?Ñ?Ð¸ %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Ð?Ñ?Ð¾Ðº %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ð?Ñ?"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÐ¢%sÐ°Ðº!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ñ?Ð¸"
diff --git a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
index e2bc012..c646c83 100644
--- a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
@@ -6,24 +6,26 @@
 # khi, 2013
 # khi, 2013
 # khi, 2013
-# Christopher Meng <cickumqt@xxxxxxxxx>, 2012
+# Christopher Meng <i@xxxxxxxx>, 2012
 # hanl <iamh4n@xxxxxxxxx>, 2011
-# Meng3, 2014
+# Meng San, 2014,2016
 # leungsookfan <leung.sookfan@xxxxxxxxxx>, 2014
+# Meng San, 2016
+# Mingye Wang <arthur200126@xxxxxxxxx>, 2016
 # khi, 2014-2015
-# YF <yfdyh000@xxxxxxxxx>, 2014-2015
+# YFdyh000 <yfdyh000@xxxxxxxxx>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 14:41+0000\n"
-"Last-Translator: khi\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-06-10 07:15+0000\n"
+"Last-Translator: Colin Childs <colin@xxxxxxxxxxxxxx>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -38,57 +40,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "æ?¥å?? Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "æº?ä»£ç ?"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "æ?´æ?¹æ?¥å¿?"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "è??ç³»æ?¹å¼?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "é??æ?©å?¨é?¨"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "æ?¾ç¤ºäº?ç»´ç ?"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "ç½?æ¡¥äº?ç»´ç ?"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "å??å??å??ï¼?"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "è?·å??äº?ç»´ç ?æ?¶å?ºé??ã??"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "äº?ç»´ç ?å??å?«ç½?æ¡¥ä¿¡æ?¯ã??å?©ç?¨äº?ç»´ç ?æ?«æ??ç¨?åº?ï¼?å?¯å°?ç?¸åº?ç??ç½?æ¡¥ä¿¡æ?¯å¤?å?¶å?°æ??æ?ºæ??å?¶ä»?è®¾å¤?ã??"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "è¯?è¯? %så??é??%så?°å??ä¸?é¡µé?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ç¬¬ %s 1 %s æ¥"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ä¸?è½½ %s Tor æµ?è§?å?¨ %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ç¬¬ %s 2 %s æ¥"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "è?·å?? %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ç¬¬ %s 3 %s æ¥"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "é«?çº§é??é¡¹"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "å?¦"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "æ? "
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "æ?¯(%sY%s)ï¼?"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "è?·å??ç½?æ¡¥(%sG%s)"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[è¿?æ?¯ä¸?å°?è?ªå?¨ç??æ??ç??é?®ä»¶ï¼?è¯·å?¿å??å¤?ã??]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "æ?¨å·²è¶?å?ºäº?å??é??é¢?ç??ç??é??å?¶ï¼?è¯·æ?¢æ?¢æ?¥ï¼?ä¸¤å°?é?®ä»¶ä¹?é?´é??è¦?æ??å°? %s å°?æ?¶ç??é?´é??ã??å?¨é?´é??æ??é?´å??å?ºç??æ??æ??é?®ä»¶å°?è¢«å¿½ç?¥ã??"
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "å?½ä»¤ï¼?ï¼?ç»?å??ä½¿ç?¨å?½ä»¤å?¯å??æ?¶æ??å®?å¤?ä¸ªé??é¡¹ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "æ¬¢è¿?æ?¥å?° BridgeDBï¼?"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "ç?®å??å?¯ç?¨ç?? transport ç±»å??ï¼?"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "ä½ å¥½ï¼?%sï¼?"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "å?¬å?±å¯?å??"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +226,7 @@ msgstr "æ?¬é?®ä»¶æ?¯å¯¹ %s ç??è?ªå?¨å??å¤?ï¼?æ?¥æ?? %s  %sã??"
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,10 +234,10 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB è?½æ??ä¾? %s å? ç§? Pluggable Transports %s ç±»å??ç½?æ¡¥ï¼?å?¯ç?¨äº?æ··æ·? Tor ç½?ç»?ç??è¿?æ?¥ï¼?ä»?è??è®©ç½?ç»?ç??æ?§è??é?¾ä»¥å?¤æ?ä½ å?¨ä½¿ç?¨ Torã??\n"
+msgstr "BridgeDB æ??ä¾?å¤?ç§?%så?¯æ??æ??ä¼ è¾?%sç½?æ¡¥ï¼?ç?¨äº?æ··æ·? Tor ç½?ç»?ç??è¿?æ?¥ï¼?ä»?è??è®©ç½?ç»?ç??æ?§è??é?¾ä»¥å?¤æ?ä½ å?¨ä½¿ç?¨ Torã??\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -122,7 +249,7 @@ msgstr "å?¦å¤?æ??ä¾?ä¸?äº?IPv6æ ¼å¼?ç??ç½?æ¡¥ï¼?ä¸?è¿?æ??äº? Pluggable Transport
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -131,33 +258,33 @@ msgid ""
 "\n"
 msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s  é??Pluggable Transports %s ç??æ?®é??ç½?æ¡¥ã??\nè?½ç?¶å?¬èµ·æ?¥ä¸?å¤?é?·ï¼?ä½?æ?¯è¿?äº?æ?®é??ç½?æ¡¥ä¾?ç?¶å?¯ä»¥å?¨å¾?å¤?æ??å?µä¸?å¸®å?©ç»?è¿?å®¡æ?¥ã??\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "ä»?ä¹?æ?¯ç½?æ¡¥ï¼?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%sç½?æ¡¥%så?³ Tor ä¸ç»§è??ç?¹ï¼?ç?¨äº?å¸®å?©ç?¨æ?·ç»?è¿?å®¡æ?¥æ??å°?é??ã??"
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "é??è¦?ä½¿ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å??é??ç?µå?é?®ä»¶è?³ %sã??æ³¨æ??ï¼?å¿?é¡»ä½¿ç?¨ç?µå?é?®ç®±å??é??è¯·æ±?ï¼?%sã??%s æ?? %sã??"
+msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å??é??ç?µå?é?®ä»¶è?³ %sã??æ³¨æ??ï¼?å¿?é¡»ä½¿ç?¨ä»¥ä¸?ç?µå?é?®ç®±å??é??è¯·æ±?ï¼?%sã??%s æ?? %sã??"
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "ç?¨ç½?æ¡¥ä¹?æ? æ³?è¿?æ?¥ï¼?é??è¦?å¸®å?©ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?è¯·å??é?®ä»¶è?³ %sã??"
@@ -165,48 +292,48 @@ msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?è¯·å??é?®ä»¶è?³ %sã??"
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "è¯·å°½é??è¯¦ç»?å?°æ??è¿°ä½ ç??æ??å?µï¼?å??æ?¬æ??ç?¨ç??ç½?æ¡¥å??å?¶ç±»å??ï¼?Tor æµ?è§?å?¨ç??æ?¬ä»¥å??ä»»ä½? Tor æ?¾ç¤ºç??ä¿¡æ?¯ç?ç?ã??"
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "ä»¥ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "è?·å¾?ç½?æ¡¥ï¼?"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "è¯·é??æ?©ç±»å??ç±»å??ã??"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "æ?¯å?¦é??è¦? %sï¼?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "è¯·è¾?å?¥ä¸?å?¾ä¸ç??å?ç¬¦ï¼?ä¸?å?ºå??å¤§å°?å??ï¼?..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "å¦?ä½?ä½¿ç?¨ç½?æ¡¥"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -215,21 +342,21 @@ msgid ""
 msgstr "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?è¯·å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?è½½é¡µé?¢ %s ç??è¯´æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 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".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 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".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -237,153 +364,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?è¯·å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?å¸®å?©ï¼?è¯·ç?¹å?»â??Tor ç½?ç»?è®¾ç½®â??å??å¯¼çª?å?£ä¸ç??â??å¸®å?©â??æ??é?®ã??"
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "æ?¾ç¤ºè¿?æ?¡ä¿¡æ?¯ã??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "è¯·æ±?æ?®é??ç½?æ¡¥ã??"
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "è¯·æ±?IPv6ç½?ç»?ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "æ??ç?§ç±»å??è¯·æ±?ä¸?å??ç?? Pluggable Transport ç½?æ¡¥ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "è?·å?? BridgeDB ç?? GnuPG å?¬å?±å¯?å??ã??"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "æ?¥å?? Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "æº?ä»£ç ?"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "æ?´æ?¹æ?¥å¿?"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "è??ç³»æ?¹å¼?"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "é??æ?©å?¨é?¨"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "æ?¾ç¤ºäº?ç»´ç ?"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "ç½?æ¡¥äº?ç»´ç ?"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "å??å??å??ï¼?"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "è?·å??äº?ç»´ç ?æ?¶å?ºé??ã??"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "äº?ç»´ç ?å??å?«ç½?æ¡¥ä¿¡æ?¯ã??å?©ç?¨äº?ç»´ç ?æ?«æ??ç¨?åº?ï¼?å?¯å°?ç?¸åº?ç??ç½?æ¡¥ä¿¡æ?¯å¤?å?¶å?°æ??æ?ºæ??å?¶ä»?è®¾å¤?ã??"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "è¯?è¯? %så??é??%så?°å??ä¸?é¡µé?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ç¬¬ %s 1 %s æ¥"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ä¸?è½½ %s Tor æµ?è§?å?¨ %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ç¬¬ %s 2 %s æ¥"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "è?·å?? %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ç¬¬ %s 3 %s æ¥"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "é«?çº§é??é¡¹"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "å?¦"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "è?·å??ç½?æ¡¥(%sG%s)"
diff --git a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
index c36c522..502b260 100644
--- a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,25 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AgustÃn Wu <losangwuyts@xxxxxxxxx>, 2016
+# Chi-Hsun Tsai, 2017
 # danfong <danfong.hsieh@xxxxxxxxx>, 2014
 # LNDDYL, 2014
+# guihu, 2016
+# Cheung Hung, 2015
 # x4r <xatierlike@xxxxxxxxx>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-03-23 08:01+0000\n"
-"Last-Translator: x4r <xatierlike@xxxxxxxxx>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-02-23 14:36+0000\n"
+"Last-Translator: å?é?¦ ç??\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -32,68 +36,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "æ?±æ?!æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
+msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "å??å ±é?¯èª¤"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "å??å§?ç¨?å¼?ç¢¼"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "è®?æ?´è¨?é??"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "è?¯çµ¡è³?è¨?"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "é?¸æ??å?¨é?¨"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "é¡¯ç¤º QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "æ?¨æ©?æ?¥ç?¨ç?? QRCode"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "æ??å??é¡?ï¼?"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "æ??æ?? QRCode æ??ä¼¼ä¹?ç?¼ç??é?¯èª¤"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "é??å?? QRCode å?«æ??æ?¨ç??æ©?æ?¥å?¨ç?¸é??è³?è¨?ï¼?å?©ç?¨ QRCode è®?å??ç¨?å¼?å°?æ¤è³?è¨?è¤?è£½é?²è¡?å??é??ç®?è£?ç½®ä¸?ã??"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¨æ?¥å?¯ç?¨....."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " ä¹?è¨±æ?¨æ??å??è©¦ %s å??å?° %sï¼?ç?¶å¾?é?¸æ??ä¸?å??ç??æ©?æ?¥é¡?å??!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "æ¥é©? %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ä¸?è¼? %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "æ¥é©? %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "å??å¾? %s æ©?æ?¥å?¨ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "æ¥é©? %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s %s çµ¦æ??æ©?æ?¥å?¨ï¼?"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "é?²é??é?¸é ?"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "å?¦"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ç?¡"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%s è¨å®?æ©?æ?¥å?¨"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[é??æ?¯ä¸?å??è?ªå??å??è¦?é?µä»¶;è«?ä¸?è¦?å??è¦?ã??]"
+msgstr "[é??æ?¯ä¸?å??è?ªå??é?µä»¶;è«?ä¸?è¦?å??è¦?ã??]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥:"
+msgstr "é??æ?¯æ?¨ç??æ©?æ?¥å?¨ï¼?"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
-msgstr "æ?¨å·²è¶?é??é??åº¦é??å?¶ã??è«?æ¸?æ?¢é??åº¦!é?»å?é?µä»¶ä¹?é??ç??æ??ç?æ??é??ç?º %s å??å°?æ??ã??å?¨é??æ®µæ??é??å?§æ??æ??å?¶ä»?ç??é?µä»¶å°?è¢«å¿½ç?¥ã??"
+msgstr "æ?¨å·²è¶?é??é??åº¦é??å?¶ã??è«?æ¸?æ?¢é??åº¦ï¼?é?»å?é?µä»¶ä¹?é??ç??æ??ç?æ??é??ç?º %s å??å°?æ??ã??è¶?é??ç??è©±ï¼?å?¨é??æ®µæ??é??å?§æ??æ??ç??é?µä»¶å°?è¢«å¿½ç?¥ã??"
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "å?½ä»¤:(çµ?å??å?½ä»¤å?¯ä»¥å??æ??æ??å®?å¤?å??é?¸é ?)"
+msgstr "å?½ä»¤ï¼?(å?¯å°?å¤?å??å?½ä»¤çµ?å??ä¸?èµ·ä»¥ä¾¿å??æ??æ??å®?å¤?å??é?¸é ?)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr "æ¡è¿?ä½¿ç?¨ BridgeDB!"
+msgstr "æ¡è¿?ä½¿ç?¨ BridgeDBï¼?"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??æ?¯æ?´ç??å?³è¼¸é¡?å??:"
+msgstr "ç?®å??æ?¯æ?´ç??å?³è¼¸é¡?å??ï¼?"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "å?¿ï¼?%s!"
+msgstr "å?¿ï¼?%sï¼?"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "æ??å??ï¼?æ?¨å¥½!"
+msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "å?¬é??é??é?°"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "é??å°?é?»å?é?µä»¶ä½¿ç?¨ rainbowsã??unicorns å?? sparkles ç?¢ç??æ?¼\n %s å?¨ %s å?¨ %sã??"
+msgstr "é??å°?é?»å?é?µä»¶æ?¯ç?º %s æ??ç?¢ç??\nå?¨ %s å?¨ %sã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,44 +230,44 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB å?¯ä»¥ä½¿ç?¨å¹¾ç¨® Pluggable Transports%s ç?? %stypes ä¾?æ??ä¾?æ©?æ?¥ï¼?\nå®?å?¯ä»¥å¹«å?©æ?¨æ··æ·?é?£æ?¥å?° Tor Networkï¼?ä½¿å?¶ä»»ä½?äººè??ç?±ç?£ç??æ?¨ç??ç¶²è·¯æµ?\né??ä¾?ç¢ºå®?æ?¨æ£ä½¿ç?¨ Tor æ??æ?´å? å?°é?£\nã??\n"
+msgstr "BridgeDB å?¯ä»¥ä½¿ç?¨å¹¾ç¨®å?¯æ??æ??å?³è¼¸ %s ç?? %stypes ä¾?æ??ä¾?æ©?æ?¥ï¼?\nå®?å?¯ä»¥å¹«å?©æ?¨æ··æ·?é?£æ?¥å?° Tor Networkï¼?ä½¿å?¶ä»»ä½?äººè??ç?±ç?£ç??æ?¨ç??ç¶²è·¯æµ?\né??ä¾?ç¢ºå®?æ?¨æ£ä½¿ç?¨ Tor æ??æ?´å? å?°é?£\nã??\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "æ??äº?å?·æ?? IPv6 ä½?å??ç??æ©?æ?¥ä¹?å?¯ç?¨ï¼?é??ç?¶æ??äº? Pluggable\nTransports è?? IPv6 ä¸?ç?¸å®¹ã??\n\n"
+msgstr "æ??äº?å?·æ?? IPv6 ä½?å??ç??æ©?æ?¥å?¨ä¹?å?¯ä½¿ç?¨ï¼?é??ç?¶æ??äº? Pluggable\nTransports è?? IPv6 ä¸?ç?¸å®¹ã??\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
 #. regular, or unexciting". Like vanilla ice cream. It refers to bridges
 #. which do not have Pluggable Transports, and only speak the regular,
 #. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: lib/bridgedb/strings.py:63
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥ %sï¼?æ²?æ??ä»»ä½?\nPluggable Transports %sï¼?é??ä¹?è¨±è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??ç¶²è·¯å¯©æ?¥ã??\n"
+msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥å?¨ %sï¼?æ²?æ??ä»»ä½?\nå?¯æ??æ??å?³è¼¸ %sï¼?é??ä¹?è¨±è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??ç¶²è·¯å¯©æ?¥ã??\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr "ä»?éº¼æ?¯æ©?æ?¥?"
+msgstr "ä»?éº¼æ?¯æ©?æ?¥å?¨ï¼?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s æ©?æ?¥ %s æ?¯ Tor ä¸ç¹¼ï¼?å?¯å¹«æ?¨è¦?é?¿å¯©æ?¥ã??"
+msgstr "%s æ©?æ?¥å?¨ %s æ?¯ä¸?ç¨®æ´?è?¥è·¯ç?±ç??ä¸ç¹¼ç¯?é»?ï¼?å?¯å¹«å?©æ?¨è¦?é?¿å¯©æ?¥ã??"
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "æ??é??è¦?ä½¿ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥!"
+msgstr "æ??é??è¦?ä½¿ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,237 +275,113 @@ msgid ""
 "%s, %s or %s."
 msgstr "å?¦ä¸?ç¨®å??å¾?æ©?æ?¥ç??æ?¹å¼?ç?ºç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨å¾?ä¸?å??é?»å?é?µä»¶æ??ä¾?å» å??ä¹?ä¸?ç??ä½?å??ä¾?ç?¼é??é?»å?é?µä»¶:\n%s, %s æ?? %sã??"
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "æ©?æ?¥ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?å¹«å?©!"
+msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?å¹«å?©ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??æ?¨ç?? Tor ç?¡æ³?é??ä½?ï¼?æ?¨æ??è©²ç?¼é??é?»å?é?µä»¶çµ¦ %sã??"
+msgstr "å¦?æ??æ?¨ç??æ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?æ?¨æ??è©²ç?¼é??é?»å?é?µä»¶çµ¦ %sã??"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
-msgstr "è©¦è??å??å?«æ??é??æ?¨æ??æ³?ç??ç?¡å?¯è?½å¤?ç??è³?è¨?ï¼?å??å?«æ?¨å??è©¦ä½¿ç?¨é??ç?? \næ©?æ?¥å?? Pluggable Transports æ¸?å?®ï¼?æ?¨ç?? Tor ç??è¦½å?¨ç??æ?¬ï¼? \nä»¥å?? Tor çµ¦å?ºç??ä»»ä½?è¨?æ?¯ã??"
+msgstr "è«?å??å?¯è?½ç??çµ¦æ??å??æ?´å¤?é??æ?¼æ?¨ç??å??é¡?ä¹?ç?¸é??è³?è¨?ï¼?å??å?«æ?¨å??è©¦ä½¿ç?¨é??ç?? \næ©?æ?¥å?¨å??å?¯æ??æ??å?³è¼¸ã??æ?¨ç??æ´?è?¥è·¯ç?±ç??è¦½å?¨ç??æ?¬\nä»¥å??æ´?è?¥è·¯ç?±çµ¦å?ºç??ä»»ä½?è¨?æ?¯ã??"
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯:"
+msgstr "é??è£¡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯ï¼?"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
-msgstr "å??å¾?æ©?æ?¥!"
+msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
-msgstr "è«?é?¸æ??æ©?æ?¥é¡?å??ç??é?¸é ?:"
+msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
-msgstr "æ?¨é??è¦? IPv6 ä½?å??å???"
+msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
-msgstr "æ?¨é??è¦? %s å???"
+msgstr "æ?¨é??è¦? %s å??ï¼?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "æ?¨ç??ç??è¦½å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
-msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??..."
+msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
-msgstr "å¦?ä½?é??å§?ä½¿ç?¨æ?¨ç??æ©?æ?¥"
+msgstr "å¦?ä½?é??å§?ä½¿ç?¨æ?¨ç??æ©?æ?¥å?¨"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "å°?æ©?æ?¥è¼¸å?¥å?° Tor ç??è¦½å?¨ä¸ï¼?è«?æ??ç?§ %s ä¸?ç??èªªæ??ï¼?Tor\nç??è¦½å?¨ä¸?è¼?é ?é?¢ %s ä¾?å??å?? Tor ç??è¦½å?¨ã??"
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??è¦½å?¨ä¸?è¼?é ?é?¢ %s ä¸¦æ??ç?§é ?é?¢ä¸?ç??èªªæ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??è¦½å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "ç?¶ã??Tor ç¶²è·¯è¨å®?ã??å°?è©±å½?å?ºæ??ï¼?æ??ä¸?ä¸?ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§ç²¾é??ï¼?ç?´å?°å®?è¦?æ±?:"
+msgstr "ç?¶ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??å°?è©±å½?å?ºæ??ï¼?æ??ä¸?ä¸?ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§è¨å®?ç²¾é??ç??å°?å¼?é?²è¡?ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??ä¾?æ??è??(ISP)é?»æ??æ??å¯©æ?¥ Tor ç¶²è·¯é?£ç·??"
+msgstr "æ?¨ç??ç¶²é??ç¶²è·¯æ??å??ä¾?æ??å??(ISP)é?»æ??æ??é??æ¿¾æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?å??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥ï¼?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼ä¸?å?°æ??å?è¼¸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??å°±å¥½ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??è©¦æ??ä¸?ä¸?ã??Tor ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??èª¬æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
+msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥å?¨ï¼?è¤?è£½å??\nå°?æ©?æ?¥ç·?è·¯è²¼ä¸?å?°æ??å?è¼¸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??å°±å¥½ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??è©¦æ??ä¸?ä¸?ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??èª¬æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
 
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "é¡¯ç¤ºæ¤è¨?æ?¯ã??"
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
-msgstr "è«?æ±? vanilla æ©?æ?¥ã??"
+msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
 
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
-msgstr "è«?æ±? IPv6 æ©?æ?¥ã??"
+msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§ TYPE è«?æ±? Pluggable Transportã??"
+msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "å??å¾? BridgeDB ç??å?¬å?± GnuPG é??é?°å?¯æ?¬ã??"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "å??å ±é?¯èª¤"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "å??å§?ç¨?å¼?ç¢¼"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "è®?æ?´è¨?é??"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "è?¯çµ¡è³?è¨?"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "é?¸æ??å?¨é?¨"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "å?ºç¤º QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "æ?¨ç??æ©?æ?¥ç?? QRCode"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "æ??å??é¡?!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "æ??æ?? QRCode æ??ä¼¼ä¹?ç?¼ç??é?¯èª¤"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "é??å?? QRCode é??æ??æ?¨ç??æ©?æ?¥è³?è¨?ã??å?¨è¡?å??è£?ç½®ä¸?æ??æ??ä»¥ç?²å¾?æ?¨ç??æ©?æ?¥è³?è¨?"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¯ç?¨..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " ä¹?è¨±æ?¨æ??å??è©¦ %s å??å?° %sï¼?ç?¶å¾?é?¸æ??ä¸?å??ç??æ©?æ?¥é¡?å??!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "æ¥é©? %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ä¸?è¼? %s Tor ç??è¦½å?¨ %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "æ¥é©? %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "å??å¾? %s æ©?æ?¥ %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "æ¥é©? %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å? å?¥å?° Tor ç??è¦½å?¨ %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust çµ¦æ??æ©?æ?¥!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "é?²é??é?¸é ?"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "å?¦"
-
-#: lib/bridgedb/templates/options.html:89
-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."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "å??å¾? BridgeDB ä¸?ç?? GnuPG å?¬é??é??é?°å?¯æ?¬ã??"
diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py
index ba555e8..d68b880 100644
--- a/bridgedb/test/test_https_server.py
+++ b/bridgedb/test/test_https_server.py
@@ -234,7 +234,7 @@ class HowtoResourceTests(unittest.TestCase):
         request.method = b'GET'
         request.addArg('lang', 'ru')
         page = self.howtoResource.render_GET(request)
-        self.assertSubstring("Ñ?Ð»ÐµÐ´Ñ?Ð¹Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°", page)
+        self.assertSubstring("Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ð¸Ñ?Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð¸ÐºÐ°", page)
 
 
 class CaptchaProtectedResourceTests(unittest.TestCase):

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

Prev by Author: [tor-commits] [bridgedb/master] Add phw to the support options.
Next by Author: [tor-commits] [community/staging] Move images to section subfolder
Previous by thread: [tor-commits] [bridgedb/develop] Add new translations.
Next by thread: [tor-commits] [bridgedb/develop] Fix broken Trac URL.
Index(es):
- Author
- Thread