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

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



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