[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

translation at torproject.org translation at torproject.org
Tue Aug 27 12:28:11 UTC 2019


commit 30843ea234d9c5973b122564746ffbafa8f91284
Author: Translation commit bot <translation at torproject.org>
Date:   Tue Aug 27 12:28:08 2019 +0000

    Update translations for tbmanual-contentspot
---
 contents+ar.po    |  267 ++-----
 contents+bg.po    |  235 ++-----
 contents+bn.po    |  265 ++-----
 contents+ca.po    |  292 +++-----
 contents+cs.po    |  243 ++-----
 contents+da.po    |  255 ++-----
 contents+de.po    |  290 ++------
 contents+el.po    |  276 ++------
 contents+en-GB.po |  239 ++-----
 contents+en.po    |  278 ++------
 contents+es-AR.po |  287 ++------
 contents+es.po    |  284 ++------
 contents+fa.po    |  291 ++------
 contents+fr.po    |  301 +++-----
 contents+ga.po    |  260 ++-----
 contents+he.po    |  268 ++-----
 contents+hr.po    |  252 ++-----
 contents+hu.po    |  274 ++------
 contents+id.po    |  277 ++------
 contents+is.po    |  278 ++------
 contents+it.po    |  290 ++------
 contents+ja.po    |  243 ++-----
 contents+ka.po    |  282 ++------
 contents+ko.po    |  251 ++-----
 contents+lt.po    |  247 ++-----
 contents+lv.po    |  239 ++-----
 contents+mk.po    |  261 ++-----
 contents+ms.po    |  283 ++------
 contents+nb-NO.po |  248 ++-----
 contents+nl.po    |  244 ++-----
 contents+nn.po    | 2005 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 contents+pl.po    |  289 ++------
 contents+pt-BR.po |  297 ++------
 contents+pt-PT.po |  290 ++------
 contents+ro.po    |  289 ++------
 contents+ru.po    |  291 ++------
 contents+sr.po    |  243 ++-----
 contents+sv-SE.po |  239 ++-----
 contents+th.po    |  289 +++-----
 contents+tr.po    |  286 ++------
 contents+uk.po    |  242 ++-----
 contents+vi.po    |  246 ++-----
 contents+zh-CN.po |  268 ++-----
 contents+zh-TW.po |  235 ++-----
 contents.pot      |  278 ++------
 45 files changed, 5096 insertions(+), 8691 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index d41d735d2..3ea27d447 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1,19 +1,19 @@
 # Translators:
 # Mohamed El-Feky <elfeky.m at gmail.com>, 2018
-# ButterflyOfFire, 2018
-# Ahmed A. <6622227a at gmail.com>, 2019
 # Ramy Rostom <ramyrostom at protonmail.com>, 2019
 # erinm, 2019
-# Ahmed IB <mee.tbhole at gmail.com>, 2019
+# Khaled Hosny, 2019
 # Emma Peel, 2019
+# Ahmed A. <6622227a at gmail.com>, 2019
+# Ahmed IB <mee.tbhole at gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Ahmed IB <mee.tbhole at gmail.com>, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,16 +57,6 @@ msgstr "للتواصل"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "الاضافات"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "أصبح مترجما لTor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "عن متصفح تور"
 
@@ -102,8 +92,6 @@ msgstr "إدارة الهويات"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "خدمات البصلة (Onion)"
 
@@ -124,24 +112,31 @@ msgstr "التحديث"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "الاضافات"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "تتبع الأعطال"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "إزالة التنصيب"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "المشاكل المعروفة"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "أصبح مترجما لTor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1169,6 +1164,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "خدمات البصلة (Onion)"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "الخدمات المتاحة عبر تور فقط"
@@ -1223,7 +1223,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr "##### كيفية الوصول إلى خدمات البصلة"
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1246,8 +1246,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "######إستكشاف الأخطاء وإصلاحها"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### تتبع الأعطال"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2062,6 +2062,11 @@ msgstr ""
 "من أحدها."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "المشاكل المعروفة"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2155,6 +2160,11 @@ msgstr ""
 "مجهول الهوية عبر Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "إزالة التنصيب"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "كيفية إزالة متصفح تور من نظامك"
@@ -2202,204 +2212,75 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "لاحظ أن أداة إزالة التنصيب في النظام لم تستخدم."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "أصبح مترجما لTor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "أصبح مترجما لمشروع Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### التسجيل على TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"توجه إلى [صفحة التسجيل في Transifex] \n"
-"(https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "أدخل معلوماتك في الحقول وانقر على زر التسجيل 'Sigb Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* إملأ في الصفحة التالية اسمك واختر \"Localization\" و \"Translator\" من "
-"القوائم المنسدلة:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* في الصفحة التالية، اختر الانضمام إلى مشروع موجود  'Join an existing "
-"project' ثم تابع."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr "*اختر لغة الترجمة من القائمة المنسدلة"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* أنت الآن مسجل! إذهب إلى [صفحة Tor Transifex] .\n"
-"(https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* انقر على زر \"الانضمام إلى فريق\" الأزرق في أقصى اليمين:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "*اختر لغة الترجمة من القائمة المنسدلة:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "إشعار سيظهر في أعلى الصفحة كالتالي:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "تنزيل متصفح تور"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
+"حمّل متصفح Tor Browser لتختبر التصفح السري الحقيقي بدون تتبع أو رصد أو "
+"رقابة."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "شكراً لإهتمامك بالمساهمة في المشروع!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "مُهمّتنا:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "تبرّع"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "تبرع الآن"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "اشترك في رسالتنا للمستجدات"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "احصل على تحديثات شهرية وفرص من مشروع تور"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "احصل على تحديثات شهرية وفرص من مشروع تور:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "سجل حساب"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"العلامات التجارية، إشعارات حقوق الطبع والنشر والقواعد للاستخدام من قبل أطراف"
-" ثالثة يمكن العثور عليها في"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "مشروع تور | دليل استخدام متصفّح تور"
+"يمكن العثور على العلامة التجارية وحقوق النشر وقواعد الاستخدام من الطرف "
+"الثالث في%(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "شعار تور"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "القائمة"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "تبرّع"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "تبرع الآن"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "تنزيل متصفح تور"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "بحث"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "مشروع تور | دليل استخدام متصفّح تور"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "الموضوعات"
diff --git a/contents+bg.po b/contents+bg.po
index 724578e07..4b83b964a 100644
--- a/contents+bg.po
+++ b/contents+bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
@@ -52,16 +52,6 @@ msgstr "За връзка"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "За Tor браузърa"
 
@@ -97,8 +87,6 @@ msgstr "Управление са самоличности"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -119,24 +107,31 @@ msgstr "Обновяване"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Решаване на проблеми"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Премахване"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Известни проблеми"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1083,6 +1078,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Услуги, които са достъпни само през Tor"
@@ -1134,7 +1134,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1157,7 +1157,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1957,6 +1957,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2037,6 +2042,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Как да премахнете Tor браузъра от компютъра си"
@@ -2084,192 +2094,69 @@ msgstr ""
 "Забележете, че стандартната функция \"Премахване\" на операционата система "
 "не се използва."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Дарете"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr ""
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Регистриане"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Дарете"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+bn.po b/contents+bn.po
index e5c44a039..5ae181c78 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -1,6 +1,6 @@
 # Translators:
 # code smite <codesmite at gmail.com>, 2018
-# Al Shahrior Hasan Sagor <shahrior3814 at gmail.com>, 2019
+# Al Shahrior Hasan Sagor <shahrior3814 at gmail.com>, 2018
 # erinm, 2019
 # Emma Peel, 2019
 # 
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -54,16 +54,6 @@ msgstr "যোগাযোগ"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "একজন টর অনুবাদক হন"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "টর ব্রাউজার সম্পর্কে"
 
@@ -99,8 +89,6 @@ msgstr "সনাক্তকরণ পরিচালনা"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "ওনিওন সেবা"
 
@@ -121,24 +109,31 @@ msgstr "আপডেট করা হচ্ছে"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "সমস্যা সমাধান"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "আনইনস্টল হচ্ছে"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "জ্ঞাত সমস্যা"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "একজন টর অনুবাদক হন"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1162,6 +1157,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "পরিষেবাগুলি কেবল টর ব্যবহার করে অ্যাক্সেসযোগ্য"
@@ -1218,7 +1218,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr "##### একটি onion পরিষেবা অ্যাক্সেস কিভাবে"
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1241,7 +1241,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr "##### সমস্যা সমাধান"
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -2069,6 +2069,11 @@ msgstr ""
 "চেক করুন।"
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2165,6 +2170,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">টর'র মধ্যে অজ্ঞাত নয়</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "আপনার সিস্টেম থেকে টর ব্রাউজার অপসারণ কিভাবে"
@@ -2216,168 +2226,25 @@ msgstr ""
 "উল্লেখ্য আপনার অপারেটিং সিস্টেমের মান \"আনইনস্টল\" ইউটিলিটি ব্যবহার করা হয় "
 "না।"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "একজন টর অনুবাদক হন "
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "একজন টর অনুবাদক হন"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"আপনি যদি আপনার ভাষায় ম্যানুয়াল বা টি ব্রাউজারের অনুবাদ করে প্রকল্পে "
-"সাহায্য করতে আগ্রহী হন, তাহলে আপনার সাহায্য ব্যাপকভাবে প্রশংসিত হবে! টর "
-"প্রকল্প স্থানীয়করণ [Localization Lab](https://www.localizationlab.org) উপর "
-"হোস্ট করা হয়েছে, একটি তৃতীয়-পক্ষের অনুবাদ টুল Transifex এ হাব । আপনি অবদান "
-"শুরু করার জন্য, আপনাকে Transifex এ সাইন আপ করতে হবে. নিচে কিভাবে সাইন আপ এবং"
-" শুরু করা যায় তার একটি রূপরেখা দেয়া হলো ।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"অনুবাদের পূর্বে, দয়া করে [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) এর টর প্রকল্প পৃষ্ঠার "
-"মাধ্যমে পড়ুন । সেখানে আপনি অনুবাদ নির্দেশিকা এবং সম্পদগুলি যা আপনাকে টর "
-"অনুবাদের অবদান রাখতে সাহায্য করবে তা পাবেন ।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### ট্রানজিসফাক্স-এ সাইন আপ করুন"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr "* [Transifex](https://transifex.com/signup/) সাইন আপ পৃষ্ঠায় যান।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "ক্ষেত্রগুলিতে আপনার তথ্য লিখুন এবং 'সাইন আপ' বোতামে ক্লিক করুন:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* আপনার নাম দিয়ে পরবর্তী পৃষ্ঠাটি পূরণ করুন এবং ড্রপ-ডাউন মেনু থেকে "
-"\"Localization\" এবং \"Translator\" নির্বাচন করুন:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* পরবর্তী পৃষ্ঠায়, ' একটি বিদ্যমান প্রকল্পে যোগ দিন ' নির্বাচন করুন এবং "
-"অব্যাহত রাখুন ।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* পরবর্তী পৃষ্ঠায়, ড্রপ ডাউন মেনু থেকে আপনি যে ভাষাগুলি কথা বলছেন তা "
-"নির্বাচন করুন এবং চালিয়ে যান।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* আপনি এখন সাইন আপ করেছেন! ওই [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/) পৃষ্ঠায় যান ।"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* দূরবর্তী ডানদিকে নীল ' যোগদান টিম ' বাটনে ক্লিক করুন:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* ড্রপডাউন মেনু থেকে অনুবাদ করতে চান এমন ভাষা নির্বাচন করুন:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* একটি বিজ্ঞপ্তি এখন পৃষ্ঠাটির শীর্ষে প্রদর্শিত হবে যেমন:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"আপনার সদস্যপদ অনুমোদন করার পর আপনি অনুবাদ শুরু করতে পারেন; যখন আপনি শুরু "
-"করতে প্রস্তুত হন, তখন কেবল [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/)  পৃষ্ঠায় ফিরে যান."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "টর ব্রাউজার ডাউনলোড করুন"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "প্রকল্পে সাহায্য করার জন্য আপনার আগ্রহের জন্য ধন্যবাদ!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "আমাদের লক্ষ্য:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
@@ -2387,49 +2254,49 @@ msgstr ""
 "মাধ্যমে মানবাধিকার এবং স্বাধীনতাকে ফিরিয়ে আনতে এবং তাদের মানবাধিকার ও "
 "স্বাধীনতায় হস্তক্ষেপ করা ।"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "ডনেট করুন"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "এখুনি দান করুন! "
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "আমাদের নিউজলেটার সাবস্ক্রাইব করুন"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "টর প্রকল্প থেকে মাসিক আপডেট এবং সুযোগ পান"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "টর প্রকল্প থেকে মাসিক আপডেট এবং সুযোগ পান:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "সাইন আপ"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "ট্রেডমার্ক, কপিরাইট বিজ্ঞপ্তি এবং তৃতীয় পক্ষের ব্যবহারের নিয়মাবলী আমাদের "
+"%(link_to_faq)s"
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "টর লোগো"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "ডনেট করুন"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "টর ব্রাউজার ডাউনলোড করুন"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "খুজুন"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "বিষয়শ্রেণী"
diff --git a/contents+ca.po b/contents+ca.po
index 424c89b89..701262c12 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -1,15 +1,16 @@
 # Translators:
-# Marc Ripoll <markripesp at gmail.com>, 2019
+# Marc Ripoll <markripesp at gmail.com>, 2018
 # Sandra Monferrer <smonferrer at gmail.com>, 2019
-# erinm, 2019
 # jmontane, 2019
+# erinm, 2019
+# Ecron <ecron_89 at hotmail.com>, 2019
 # Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -55,16 +56,6 @@ msgstr "Contacte"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Converteix-te en un traductor de Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Quant al navegador Tor"
 
@@ -100,8 +91,6 @@ msgstr "Gestió d'identitats"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Serveis Onion"
 
@@ -122,24 +111,31 @@ msgstr "Actualització"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Detecció d'errors"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Desinstal·lació"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problemes coneguts"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Converteix-te en un traductor de Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1239,6 +1235,11 @@ msgstr ""
 " en el menú d'informació del lloc web, en la barra de l'adreça web."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "SERVEIS CEBA"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Serveis que només són accessibles utilitzant Tor"
@@ -1295,8 +1296,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Com accedir a un servei ceba"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### COM ACCEDIR A UN SERVEI CEBA"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1327,8 +1328,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Detecció d'errors"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### DETECCIÓ D'ERRORS"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2179,6 +2180,11 @@ msgstr ""
 "llistat. "
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ASSUMPTES CONEGUTS"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2277,6 +2283,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">no és anònim sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "DESINSTAL·LANT"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Com eliminar el navegador Tor del seu sistema"
@@ -2328,226 +2339,79 @@ msgstr ""
 "El sistema operatiu de forma estandarditzada la funció de \"Desinstal·lar\" "
 "no està usada."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "CONVERTEIX-TE EN UN TRADUCTOR DE TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Convertir-se en un traductor del projecte Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Si estàs interessat a ajudar el projecte traduint el manual o el navegador "
-"Tor al teu idioma, la teva ajuda serà molt apreciada! La localització del "
-"projecte Tor està situat a [Localization "
-"Lab](https://www.localizationlab.org) centrat a Transifex, una eina de "
-"traducció aliena al projecte Tor. A fi de poder començar a contribuir, "
-"s'haurà de registrar amb Transifex. Sota es pot trobar detalls sobre com "
-"registrar-se i començar a col·laborar."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Abans de traduir, llegeixi la pàgina del projecte Tor a [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). Allà trobarà pautes "
-"per a la traducció i recursos que el podran ajudar a les traduccions de Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### REGISTRA'T A TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Passeu a la <a href=\"https://transifex.com/signup/\">pàgina d'inscripció "
-"de Transifex</a>."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Introduïu la vostra informació als camps i feu clic al botó \"Registra't\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Ompliu la pàgina següent amb el vostre nom i seleccioneu \"Localització\" "
-"i \"Traductor\" al menú desplegable:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* A la pàgina següent, seleccioneu \"Uniu-vos a un projecte existent\" i "
-"continueu."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* A la pàgina següent, seleccioneu els idiomes que parleu al menú "
-"desplegable i continueu."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Ja t'has inscrit! Aneu a la pàgina de <a "
-"href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex</a>."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Feu clic al botó blau \"Uneix-te a l'equip\" a l'extrem dret:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Seleccioneu l'idioma que voleu traduir al menú desplegable:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Ara, una notificació apareixerà a la part superior de la pàgina:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Després d'haver aprovat la solicitud pot començar a traduir; simplement "
-"torna a <a href=\"https://www.transifex.com/otf/torproject/\">Pàgina "
-"projecte Tor a Transifex</a> quan estiguis preparat per començar."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Descarregueu el navegador Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"A  [Localization Lab Wiki] (https://wiki.localizationlab.org/index.php/Tor) "
-"també hi trobareu informació quan a les traduccions amb més prioritat."
+"Baixeu el Navegador Tor i proveu com és navegar amb privadesa real, sense "
+"seguiments, vigilància ni censura."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Gràcies pel seu interest en ajudar al projecte!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "La nostra missió:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"promoure els drets humans i les llibertats per mitjà de la creació i "
-"desplegament de tecnològies d'anonimat i privacitat lliures i de codi obert,"
-" el suport a la seva disponibilitat i la utilització sense restriccions i el"
-" foment de la seva comprensió científica i popular."
+"Promoure els drets humans i les llibertats per mitjà de la creació i "
+"desplegament de tecnologies d'anonimat i privadesa lliures i de codi obert, "
+"el suport a la seva disponibilitat i la utilització sense restriccions i el "
+"foment de la seva comprensió científica i popular."
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Fes una donació"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Feu una donació"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Subscriure's al nostre butlletí informatiu"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Obteniu actualitzacions i oportunitats mensuals del projecte Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Obteniu actualitzacions i oportunitats mensuals del Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registrar‐se"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"Marques, avisos de drets d'autor, i les regles per a l'ús per part de "
-"tercers es poden trobar a "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Projecte Tor | Manual del navegador Tor"
+"Podeu trobar informació sobre la marca, avisos de drets d'autor, i regles "
+"per a l'ús per part de tercers en les %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menú"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Fes una donació"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "FES UNA DONACIÓ"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Descarregueu el navegador Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Cerca"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Projecte Tor | Manual del navegador Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Temes"
diff --git a/contents+cs.po b/contents+cs.po
index 0ff8e7711..90f15b143 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -2,18 +2,18 @@
 # trendspotter <j.podhorecky at volny.cz>, 2018
 # Mikuláš Vrba <mikulasvrba at gmail.com>, 2018
 # Michal Várady <miko.vaji at gmail.com>, 2019
-# Michal Stanke <mstanke at mozilla.cz>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # David Stepan <stepand at tiscali.cz>, 2019
+# Emma Peel, 2019
+# Michal Stanke <mstanke at mozilla.cz>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: David Stepan <stepand at tiscali.cz>, 2019\n"
+"Last-Translator: Michal Stanke <mstanke at mozilla.cz>, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,16 +57,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "O prohlížeči Tor"
 
@@ -102,8 +92,6 @@ msgstr "Správa identit"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Služby Onion"
 
@@ -124,24 +112,31 @@ msgstr "Aktualizace"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Odstraňování problémů"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Odinstalace"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Známé problémy"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1069,6 +1064,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1113,7 +1113,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1136,8 +1136,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr ""
+msgid "##### TROUBLESHOOTING"
+msgstr "##### ODSTRAŇOVÁNÍ PROBLÉMŮ"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1878,6 +1878,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ZNÁMÉ PROBLÉMY"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1958,6 +1963,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "ODINSTALACE"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr ""
@@ -2002,192 +2012,69 @@ msgstr ""
 "Upozorňujeme, že standardní nástroj \"Odinstalace\" operačního systému se "
 "nepoužívá."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Přispějte"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Přispějte"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registrovat se"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Přispějte"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+da.po b/contents+da.po
index 674a7aa82..7a1f5aac7 100644
--- a/contents+da.po
+++ b/contents+da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: scootergrisen, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -53,16 +53,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Bliv en Tor-oversætter"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Om Tor Browser"
 
@@ -98,8 +88,6 @@ msgstr "Håndtering af identiteter"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Oniontjenester"
 
@@ -120,24 +108,31 @@ msgstr "Opdatering"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Fejlfinding"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Afinstallering"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Kendte problemer"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Bliv en Tor-oversætter"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1024,6 +1019,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Tjenester som kun kan tilgås ved brug af Tor"
@@ -1070,8 +1070,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Tilgå en onionadresse"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1093,8 +1093,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Fejlfinding"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1832,6 +1832,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1912,6 +1917,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Sådan fjernes Tor Browser fra dit system"
@@ -1954,194 +1964,77 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "Bemærk at dit styresystems standard-\"Afinstaller\"-værktøj ikke bruges."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Bliv en Tor-oversætter for Tor-projektet"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Download Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
+"Download Tor Browser for at opleve ægte privat browsing uden sporing, "
+"overvågning og censur."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Vores mission:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
+"At fremme menneskerettigheder og -friheder ved at oprette og udsende frie og"
+" open source teknologier for anonymitets og privatliv, støtte deres "
+"ubegrænsede tilgængelighed og bruge og fremme deres videnskabslige og "
+"populære forståelse."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donér"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donér nu"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Abonner på vores nyhedsbrev"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr ""
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Få månedlige opdateringer og muligheder fra Tor-projektet:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Tilmeld"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-"Varemærke, ophavsretsnotitser og regler for brug af tredjeparter findes i "
-"vores "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 msgstr ""
+"Varemærke, copyrightnotitser og regler om anvendelse af tredjeparter findes "
+"i vores %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donér"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Download Tor Browser"
-
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+de.po b/contents+de.po
index df9d735ad..28e09d488 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,18 +1,18 @@
 # Translators:
 # Jim John <transifex at exware.de>, 2018
-# Oliver Parczyk, 2019
-# Marcel Haring <getting at autistici.org>, 2019
 # erinm, 2019
+# Marcel Haring <getting at autistici.org>, 2019
 # Emma Peel, 2019
 # Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
+# c8faa9c4b9d81319c5c2fd62ae3a9956, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019\n"
+"Last-Translator: c8faa9c4b9d81319c5c2fd62ae3a9956, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,16 +56,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Werde ein Tor-Übersetzer"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Über den Tor-Browser"
 
@@ -101,8 +91,6 @@ msgstr "Identitäten verwalten"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion-Dienste"
 
@@ -123,24 +111,31 @@ msgstr "Aktualisieren"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Fehlerbehebung"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Deinstallieren"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Bekannte Probleme"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Werde ein Tor-Übersetzer"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1267,6 +1262,11 @@ msgstr ""
 "Standortinformationen und in der URL-Leiste aufrufen."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION-DIENST"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Dienste, die nur über Tor zugänglich sind"
@@ -1325,8 +1325,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Wie verbinde ich mich mit einem Onion-Dienst?"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### WIE MAN AUF EINEN ONION-DIENST ZUGREIFT"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1357,8 +1357,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Fehlerbehebung"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### PROBLEMLÖSUNG"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2260,6 +2260,11 @@ msgstr ""
 "auftritt, dort bereits aufgelistet ist."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "BEKANNTE PROBLEME"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2358,6 +2363,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">nicht anonym über Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "DEINSTALLIERUNG"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "So entfernst du den Tor-Browser von deinem System"
@@ -2409,230 +2419,80 @@ msgstr ""
 "Beachte, dass das standardmäßige Dienstprogramm \"Uninstall\" deines "
 "Betriebssystems nicht verwendet wird."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "TOR-ÜBERSETZER WERDEN"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Werde Übersetzer für das Tor-Projekt"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Wenn du daran interessiert bist, dem Projekt zu helfen, indem du das "
-"Handbuch oder den Tor-Browser in deine Sprache übersetzt, wäre deine Hilfe "
-"sehr willkommen! Die Lokalisierung von Tor-Projekten wird im [Localization "
-"Lab](https://www.localizationlab.org) Hub auf Transifex, einem "
-"Übersetzungstool von Drittanbietern, gehostet. Um einen Beitrag leisten zu "
-"können, musst du dich bei Transifex anmelden. Nachfolgend findest du eine "
-"Übersicht darüber, wie du dich anmeldest und beginnen kannst."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Bevor du übersetzt, lies bitte die Tor-Projekt-Seite auf dem [Localization "
-"Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). Dort findest du "
-"Übersetzungsrichtlinien und Ressourcen, die dir helfen, zu Tor-Übersetzungen"
-" beizutragen."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### ANMELDEN AN TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Besuche die [Transifex Anmeldeseite](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Gib deine Daten in die Felder ein und klicke auf die Schaltfläche "
-"\"Anmelden\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Fülle die nächste Seite mit deinem Namen aus und wähle \"Lokalisierung\" "
-"und \"Übersetzer\" aus den Dropdown-Menüs:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Wähle auf der nächsten Seite \"An einem bestehenden Projekt teilnehmen\", "
-"und fahre fort."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Wähle auf der nächsten Seite die Sprachen, die du sprichst, aus dem "
-"Dropdown-Menü aus, und fahre fort."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Du bist jetzt angemeldet! Gehe auf die Seite [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Klicke auf die blaue Schaltfläche \"Team beitreten\" ganz rechts:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Wähle die Sprache, die du übersetzen möchtest, aus dem Dropdown-Menü:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Eine Benachrichtigung erscheint nun wie gewohnt oben auf der Seite:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Nachdem deine Mitgliedschaft bestätigt wurde, kannst du mit dem Übersetzen "
-"beginnen; es gibt eine Liste der benötigten Übersetzungen unter [Tor "
-"Transifex Seite](https://www.transifex.com/otf/torproject/), wenn du bereit "
-"bist zu beginnen."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor Browser herunterladen"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"Das [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"enthält auch Informationen über die Übersetzungen mit größerer Priorität."
+"Lade Tor Browser herunter, um echtes privates Surfen ohne Verfolgung, "
+"Überwachung oder Zensur zu erleben."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Vielen Dank für dein Interesse an der Unterstützung des Projekts!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Unsere Mission:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"um Menschenrechte und Freiheiten durch die Entwicklung und Verbreitung von "
-"Open Source Anonymitäts- und Privatsphäre-Technologien  zu fördern, ihre "
+"Menschenrechte und Freiheiten durch die Entwicklung und Verbreitung von Open"
+" Source Anonymitäts- und Privatsphäre-Technologien zu fördern, ihre "
 "ungehinderte Verfügbarkeit zu unterstützen und ihr Verständnis in "
 "Wissenschaft und der Allgemeinheit zu vergrößern."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Spenden"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Spende jetzt"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Abonnieren Sie unseren Newsletter"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
-"Erhalte monatliche Berichte und Beschäftigungsaussichten vom Tor Project"
+"Erhalte monatliche Berichte und Beschäftigungsaussichten vom Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registrieren"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Markenrechts-, Copyright-Mitteilungen und Regeln für Drittparteien finden "
-"sich in unserer "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Tor Browser Benutzerhandbuch"
+"sich in unserer %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menü"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Spenden"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "SPENDE JETZT"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Tor Browser herunterladen"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Suchen"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser Benutzerhandbuch"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Themen"
diff --git a/contents+el.po b/contents+el.po
index 5aecadf8b..fc85853da 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -1,18 +1,19 @@
 # Translators:
-# A Papac <ap909219 at protonmail.com>, 2019
-# Panagiotis Vasilopoulos, 2019
+# Elektra M. <safiragon at yahoo.gr>, 2018
+# A Papac <ap909219 at protonmail.com>, 2018
+# Panagiotis Vasilopoulos, 2018
 # erinm, 2019
 # Adrian Pappas <pappasadrian at gmail.com>, 2019
-# Elektra M. <safiragon at yahoo.gr>, 2019
 # Emma Peel, 2019
+# Sofia K., 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Sofia K., 2019\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,16 +57,6 @@ msgstr "Επικοινωνία"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Πρόσθετα"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Πως να γίνετε μεταφραστής του Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Σχετικά με τον Tor Browser"
 
@@ -101,8 +92,6 @@ msgstr "Διαχείριση ταυτοτήτων"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Υπηρεσίες Onion"
 
@@ -123,24 +112,31 @@ msgstr "Αναβάθμιση"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Αντιμετώπιση προβλημάτων"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Απεγκατάσταση"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Γνωστά ζητήματα"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Πως να γίνετε μεταφραστής του Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1226,6 +1222,11 @@ msgstr ""
 " διευθύνσεων URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Υπηρεσίες που είναι διαθέσιμες μόνο μέσω Tor"
@@ -1285,8 +1286,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Πως να έχω πρόσβαση σε μια υπηρεσία onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1317,8 +1318,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Αντιμετώπιση προβλημάτων"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2179,6 +2180,11 @@ msgstr ""
 "αντιμετωπίζεις βρίσκεται ήδη στη λίστα μας."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2278,6 +2284,11 @@ msgstr ""
 "Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Πώς να καταργήσετε τον Tor Browser από το σύστημά σας"
@@ -2326,165 +2337,25 @@ msgstr ""
 "Θυμηθείτε πως δεν χρησιμοποιείται η συνηθισμένη λειτουργία \"Απεγκατάσταση\""
 " του λειτουργικού σας συστήματος."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Πως να γίνετε μεταφραστής του Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Αν ενδιαφέρεστε να βοηθήσετε το project με τη μετάφραση του manual ή του Tor"
-" Browser στη γλώσσα σας, η βοήθειά σας θα εκτιμηθεί ιδιαίτερα! Για να "
-"ξεκινήσετε να συνεισφέρετε θα πρέπει να εγγραφείτε στο Transifex, το τρίτο "
-"μέρος που διευκολύνει με τις μεταφράσεις μας. Παρακάτω περιγράφεται το πώς "
-"να εγγραφείτε και να ξεκινήσετε."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Πήγαινε στην [σελίδα εγγραφής του "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Συμπληρώστε τις πληροφορίες σας στα πεδία και πατήστε \"Εγγραφή\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Συμπληρώστε την επόμενη σελίδα με το όνομά σας και επιλέξτε "
-"\"Τοπικοποίηση\" στο μενού που θα εμφανιστεί:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Στην επόμενη σελίδα, επιλέξτε τη \"Συμμετοχή σε υπάρχον πρότζεκτ\" και "
-"συνεχίστε."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Στην επόμενη σελίδα, επιλέξτε τις γλώσσες που μιλάτε από το μενού που θα "
-"εμφανιστεί και συνεχίστε."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Τώρα έχετε εγγραφεί! Πηγαίνετε στη [Σελίδα του Tor στο "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Πατήστε το μπλε σήμα \"Μπείτε στην ομάδα\" πάνω δεξιά:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Επιλέξτε τη γλώσσα στην οποία θα θέλατε να μεταφράσετε από το μενού που θα"
-" εμφανιστεί:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-"* Μία ειδοποίηση θα εμφανιστεί στην κορυφή της σελίδας όπως ακολουθεί:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Κατεβάστε τον Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Σας ευχαριστούμε για το ενδιαφέρον σας στην βελτίωση του έργου μας!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Η αποστολή μας:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
@@ -2495,50 +2366,49 @@ msgstr ""
 "διαθεσιμότητα και χρήση τους και ενισχύοντας την επιστημονική και κοινή τους"
 " κατανόηση."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Δωρίστε"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Κάντε μια δωρεά τώρα!"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Εγγραφείτε στο Newsletter μας"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Λάβετε μηνιαίες ενημερώσεις και ευκαιρίες από το Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Εγγραφή"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Τα σήματα κατατεθέν, οι όροι πνευματικών δικαιωμάτν και οι κανόνες περί "
-"χρήσης τους από τρίτους μπορούν να βρεθούν εδώ:"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Εγχειρίδιο του Tor Browser "
+"χρήσης τους από τρίτους μπορούν να βρεθούν εδώ %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Λογότυπο Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Μενού"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Δωρίστε"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Κατεβάστε τον Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Αναζήτηση"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Εγχειρίδιο του Tor Browser "
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Θέματα"
diff --git a/contents+en-GB.po b/contents+en-GB.po
index 78c9ccef4..8b96c32fc 100644
--- a/contents+en-GB.po
+++ b/contents+en-GB.po
@@ -1,14 +1,14 @@
 # Translators:
-# Andi Chandler <andi at gowling.com>, 2019
 # erinm, 2019
+# Andi Chandler <andi at gowling.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Andi Chandler <andi at gowling.com>, 2019\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,16 +52,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "About Tor Browser"
 
@@ -97,8 +87,6 @@ msgstr "Managing identities"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -119,24 +107,31 @@ msgstr "Updating"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Troubleshooting"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Uninstalling"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Known issues"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1077,6 +1072,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Services that are only accessible using Tor"
@@ -1125,7 +1125,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1148,7 +1148,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1938,6 +1938,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2018,6 +2023,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "How to remove Tor Browser from your system"
@@ -2064,192 +2074,69 @@ msgid ""
 msgstr ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donate"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donate Now"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donate"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+en.po b/contents+en.po
index d94ef2027..6eb7bd87e 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: en <LL at li.org>\n"
@@ -48,16 +48,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Becoming a Tor translator"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "About Tor Browser"
 
@@ -93,8 +83,6 @@ msgstr "Managing identities"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Services"
 
@@ -115,24 +103,31 @@ msgstr "Updating"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Troubleshooting"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Uninstalling"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Known issues"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Becoming a Tor Translator"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1217,6 +1212,11 @@ msgstr ""
 "information menu, in the URL bar."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION SERVICES"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Services that are only accessible using Tor"
@@ -1274,8 +1274,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### HOW TO ACCESS AN ONION SERVICE"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1305,8 +1305,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### TROUBLESHOOTING"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2178,6 +2178,11 @@ msgstr ""
 " there."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "KNOWN ISSUES"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2273,6 +2278,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "UNINSTALLING"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "How to remove Tor Browser from your system"
@@ -2323,225 +2333,79 @@ msgid ""
 msgstr ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "BECOMING A TOR TRANSLATOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Becoming a translator for the Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### SIGNING UP ON TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Enter your information into the fields and click the 'Sign Up' button:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr "* On the next page, select 'Join an existing project' and continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Click the blue 'Join Team' button on the far right:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Select the language you would like to translate from the dropdown menu:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* A notification will now show up on the top of the page like so:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Download Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Our mission:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donate"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donate Now"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Subscribe to our Newsletter"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Get monthly updates and opportunities from the Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Sign up"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donate"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONATE NOW"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Download Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Search"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser Manual"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Topics"
diff --git a/contents+es-AR.po b/contents+es-AR.po
index 81e190b3a..1f37c9816 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -1,15 +1,15 @@
 # Translators:
 # sbosio <santiago.bosio at gmail.com>, 2018
-# Emma Peel, 2019
-# erinm, 2019
+# Emma Peel, 2018
 # Joaquín Serna, 2019
+# erinm, 2019
 # Zuhualime Akoochimoya, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -55,16 +55,6 @@ msgstr "Contacto"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Complementos"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Siendo traductor para Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Acerca del Navegador Tor"
 
@@ -100,8 +90,6 @@ msgstr "Gestionando identidades"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Servicios Onion"
 
@@ -122,24 +110,31 @@ msgstr "Actualizando"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Complementos"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Solución de problemas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Desinstalando"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Dificultades conocidas"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Siendo traductor para Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1245,6 +1240,11 @@ msgstr ""
 " información del sitio, en la barra URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Servicios que solamente son accesibles usando Tor"
@@ -1303,8 +1303,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Cómo acceder un servicio onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1335,8 +1335,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Solución de problemas"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2191,6 +2191,11 @@ msgstr ""
 "estás experimentando está ya listado ahí."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2290,6 +2295,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">no es anónimo sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Cómo remover el Navegador Tor de tu sistema"
@@ -2337,230 +2347,71 @@ msgstr ""
 "Fijate que no se usará la utilidad estándar para \"Desinstalar\" de tu "
 "sistema operativo."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Siendo traductor para el proyecto Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Si estás interesado en ayudar al proyecto traduciendo el manual o el "
-"Navegador Tor a tu lenguaje, ¡tu ayuda sería grandemente apreciada! La "
-"localización del Proyecto Tor está alojada en el nodo [Localization "
-"Lab](https://www.localizationlab.org) en Transifex, una herramienta de "
-"traducción tercerizada. En orden para empezar a contribuir deberás "
-"registrarte con Transifex. Debajo hay un lineamiento de cómo registrarse y "
-"empezar."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Antes de traducir, por favor leé por completo la página del Proyecto Tor en "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"Allí encontrarás lineamientos de traducción y recursos que te ayudarán a "
-"contribuir a las traducciones para Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Andá a la [página de registro de "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Entrá tu información en los campos y cliqueá el botón 'Registrarse':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"Llená la página siguiente con tu nombre y seleccioná 'Localización' y "
-"'Traductor' con los menúes desplegables:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* En la siguiente página, seleccioná 'Unirse a un proyecto existente' y "
-"continuá."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* En la siguiente página, seleccioná los lenguajes que hablás con los menúes"
-" desplegables y continuá."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"¡Ya estás registrado! Andá a la [página Tor de "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Cliqueá el botón azul 'Unirse a equipo' en el extremo derecho:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Seleccioná el lenguaje que te gustaría traducir con los menúes "
-"desplegables:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-"* Una notificación aparecerá ahora al tope de la página como la siguiente:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Luego que tu membresía sea aprobada, podés empezar a traducir; hay una lista"
-" de traducciones necesitadas en [página Tor de "
-"Transifex](https://www.transifex.com/otf/torproject/) cuando estés listo "
-"para empezar."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Descargar Navegador Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"La [Wiki de Localization "
-"Lab](https://wiki.localizationlab.org/index.php/Tor) también tiene "
-"información acerca de las traducciones con mayor prioridad."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "¡Gracias por tu interés en ayudar al proyecto!"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Nuestra misión:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"avanzar los derechos y libertades humanas creando y desplegando tecnologías "
-"de anonimato y privacidad de fuente abierta, soportando su disponibilidad y "
-"uso irrestricto, y ampliando su entendimiento científico y popular."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Doná"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Doná ahora"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Suscribite a nuestro boletín informativo"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Obtené actualizaciones y oportunidades mensuales del proyecto Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Suscribirte"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"Las marcas registradas, notas de derechos de autor, y reglas de uso por "
-"terceros pueden ser encontradas en nuestro"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Proyecto Tor | Manual del Navegador Tor"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menú"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Doná"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Descargar Navegador Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Búsqueda"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Proyecto Tor | Manual del Navegador Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Tópicos"
diff --git a/contents+es.po b/contents+es.po
index f77662c41..5187c7142 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -3,14 +3,15 @@
 # Antonela D <antonela at torproject.org>, 2019
 # erinm, 2019
 # Emma Peel, 2019
+# sim, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: sim, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +55,6 @@ msgstr "Contactar"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Complementos"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Traducir Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Sobre el Tor Browser"
 
@@ -99,8 +90,6 @@ msgstr "Administrar identidades"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Servicios cebolla"
 
@@ -121,24 +110,31 @@ msgstr "Actualizar"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Complementos"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Resolución de problemas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Desinstalar"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problemas conocidos"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Traducir Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1243,6 +1239,11 @@ msgstr ""
 "dentro del menú de información del sitio, en la barra URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "Servicios Onion"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Servicios que sólo son accesibles usando Tor"
@@ -1302,8 +1303,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### CÓMO ACCEDER A UN SERVICIO CEBOLLA"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### COMO ACCEDER UN SERVICIO CEBOLLA"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1334,8 +1335,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Resolución de problemas"
+msgid "##### TROUBLESHOOTING"
+msgstr "#### SOLUCIÓN DE PROBLEMAS "
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2225,6 +2226,11 @@ msgstr ""
 "que estás experimentando ya está listado allí."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "Problemas conocidos"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2324,6 +2330,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">​no es anónimo sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "Desinstalar"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Cómo eliminar a Tor de tu sistema"
@@ -2375,228 +2386,79 @@ msgstr ""
 "Toma en cuenta que no se usa la utilidad \"Desinstalar\" estándar de tu "
 "sistema operativo."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "Traducir Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Conviértete en traductor del Proyecto Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Si estás interesado o interesada en ayudar con el proyecto traduciendo el "
-"manual o el Tor Browser a tu idioma, ¡te agradeceríamos la ayuda! La "
-"localización de Tor Project está en el Hub de  [Localization "
-"Lab](https://www.localizationlab.org), en Transifex, página que facilita "
-"nuestras traducciones. Para comenzar a contribuir tendrás que registrarte "
-"con Transifex. A continuación aparece un resumen de cómo registrarse y "
-"comenzar."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Antes de traducir, por favor lee por completo la página del Proyecto Tor en "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"Allí encontrarás instrucciones de traducción y recursos que te ayudarán a "
-"contribuir en traducciones para Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### REGISTRARSE EN TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Dírigete a la [página de registro de "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Ingresa la información en los campos y clic en el botón 'Sign Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Completa la siguiente página con tu nombre y selecciona \"Localización\" y"
-" \"Traductor\" en los menús desplegables:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* En la siguiente página, selecciona \"unirse a un proyecto existente\" y "
-"continúa."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* En la siguiente página, selecciona los idiomas que hablas en el menú "
-"desplegable y continúa."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* ¡Ya has firmado! Ve a la [página de Tor en "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Clic en el botón azul \"Unirse al Equipo\" en el lado derecho:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Selecciona el menú que desearías traducir en el menú desplegable:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Se mostrará una notificación como esta en lo alto de la página:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Después de que se apruebe tu membresía, puedes comenzar a traducir; "
-"sencillamente dirigite a la <a "
-"href=\"https://www.transifex.com/otf/torproject/\">página Tor Transifex</a> "
-"cuando estés lista para comenzar."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Bajarse el Navegador Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"El [wiki de Localization "
-"Lab](https://wiki.localizationlab.org/index.php/Tor) también tiene "
-"información sobre las traducciones con más alta prioridad."
+"Descarga Navegador Tor para experimentar navegación privada real sin "
+"rastreo, vigilancia ni censura."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "¡Gracias por tu interés en apoyar el proyecto!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Nuestra misión:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"promover los derechos humanos y las libertades mediante la creación y "
+"Promover los derechos humanos y las libertades mediante la creación y "
 "despliegue de tecnologías de anonimato y privacidad libres y de código "
 "abierto, el apoyo a su disponibilidad y utilización sin restricciones y el "
 "fomento de su comprensión científica y popular."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donar"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Dona Ahora"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Suscríbete a nuestra lista de correo"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Recibe noticias mensuales y oportunidades del Proyecto Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Recibe noticias mensuales y oportunidades del Proyecto Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registrarse"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Se pueden encontrar, la marca registrada, las notas de derechos de autor, y "
-"las reglas de uso por terceras partes, en nuestra "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manual de usuario del Navegador Tor"
+"las reglas de uso por terceras partes, en nuestra %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menú"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donar"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONA AHORA"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Bajarse el Navegador Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Buscar"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manual de usuario del Navegador Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Temas"
diff --git a/contents+fa.po b/contents+fa.po
index f757a8eef..5879b1b7a 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1,20 +1,22 @@
 # Translators:
 # Ali Mirjamali <ali.mirjamali at gmail.com>, 2019
-# erinm, 2019
-# Reza Ghasemi, 2019
 # Vox, 2019
 # Seyyed Hossein Darvari <xhdix at yahoo.com>, 2019
+# MYZJ, 2019
+# Goudarz Jafari <goudarz.jafari at gmail.com>, 2019
+# erinm, 2019
 # Emma Peel, 2019
+# A.Mehraban <Mehr.Ban at chmail.ir>, 2019
 # Arya Abidi <arya.abidi at gmail.com>, 2019
-# MYZJ, 2019
+# Reza Ghasemi, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: MYZJ, 2019\n"
+"Last-Translator: Reza Ghasemi, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,16 +60,6 @@ msgstr "تماس"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "افزونه‌ها"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "مترجم تور شوید"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "درباره مرورگر تور"
 
@@ -103,8 +95,6 @@ msgstr "مدیریت هویت ها"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "سرویس های پیازی"
 
@@ -125,24 +115,31 @@ msgstr "بروز رسانی تور"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "افزونه‌ها"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "عیب یابی"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "حذف مرورگر تور"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "مشکلات شناخته شده"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "مترجم تور شوید"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1234,6 +1231,11 @@ msgstr ""
 "دسترسی داشته باشید."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "سرویس های پیاز"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "سرویس هایی که فقط با تور در دسترس هستند"
@@ -1290,8 +1292,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### چگونه به یک سرویس onion دسترسی داشته باشیم"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1317,8 +1319,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### پشتیبانی"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2209,6 +2211,11 @@ msgstr ""
 " در آن جا وجود دارد یا نه."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "مشکلات احتمالی"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2307,6 +2314,11 @@ msgstr ""
 "باشد</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "در حال پاک کردن"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "چگونه مرورگر تور را از سیستم خود حذف کنید"
@@ -2358,224 +2370,73 @@ msgstr ""
 "نکته:توجه داشته باشید که خدمت استاندارد حذف نصب نرم افزار سیستم عامل شما "
 "استفاده نمی شود."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "مترجم تور شوید"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "شما هم جزو مترجمین پروژه تور شوید"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"اگر مایل به کمک به پروژه با ترجمه‌ی راهنما یا مرورگر تور به زبان خود هستید، "
-"از کمک شما استقبال می‌کنیم! بومی‌سازی پروژه‌ی تور در هاب [آزمایشگاه "
-"بومی‌سازی](https://www.localizationlab.org) در Transifex، که یک ابزار "
-"ترجمه‌ی طرف ثالث است، قرار دارد. برای شروع باید در Transifex عضو شوید. در "
-"بخش زیر چگونگی عضویت و شروع به کار را می‌بینید."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"قبل از شروع به ترجمه، لطفا صفحه‌ی پروژه‌ی تور را در  [ویکی آزمایشگاه "
-"بومی‌سازی](https://wiki.localizationlab.org/index.php/Tor) بخوانید. در اینجا"
-" دستورالعمل‌ها و منابعی که به مشارکت شما در ترجمه‌ی تور کمک خواهند کرد را "
-"خواهید یافت."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### ثبت نام در وب سایت TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* به نشانی [Transifex signup page](https://transifex.com/signup/) بروید."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"اطلاعات خود را در زمینه‌های مربوطه وارد کنید و سپس بر روی دکمه ثبت‌نام کلیک "
-"کنید:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* صفحه بعدی را با نام خود تکمیل و از منوی کشویی «محلی سازی» و «مترجم» را "
-"انتخاب کنید:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* در صفحه ی بعد، گزینه‌ی 'Join an existing project' را  انتخاب کرده و ادامه "
-"دهید."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* در صفحه‌ی بعد، زبانی که با آن  صحبت می‌کنید را از منوی کشویی انتخاب کرده  "
-"و ادامه دهید."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* اکنون ثبت نام شما انجام شده است! به [صفحه تور در "
-"TRANSIFEX](https://www.transifex.com/otf/torproject/) بروید."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* بر روی دکمه آبی 'Join Team' در سمت راست کلیک کنید:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* زبانی را که می‌خواهید ترجمه کنید را از منوی کشویی انتخاب کنید:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* یک اعلان در بالای صفحه نمایش خواهد یافت:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"پس از اینکه عضویت شما تایید شود، می توانید ترجمه کردن را آغاز کنید. هر زمان "
-"آماده بودید، لیستی از ترجمه های موردنیاز، در [صفحه تور در "
-"TRANSIFEX](https://www.transifex.com/otf/torproject/) قرار گرفته است."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "بارگیری مرورگر تور"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"هم چنین درباره ترجمه هایی که از اولویت بیشتری برخوردار هستند، اطلاعاتی در  "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) آمده"
-" است."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "با تشکر از علاقه‌ی شما به کمک به پروژه!"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "ماموریت ما:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"گسترش و  پیشبرد حقوق بشر و آزادی های انسانی، بوسیله ایجاد و توسعه فناوری های"
-" رایگان و متن باز حریم خصوصی و ناشناس بودن در فضای مجازی، پشتیبانی نامحدود "
-"برای در دسترس بودن و استفاده از آن ها و راهنمایی به مردم در جهت درک علمی این"
-" فناوری ها."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "کمک مالی"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "اکنون اهداء کنید"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "اشتراک در خبرنامه"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "بروز رسانی ماهانه و فرصت‌ها از پروژه‌ی تور را دریافت کنید"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "به‌روز رسانی ماهانه و فرصت‌ها از پروژه‌ی تور را دریافت کنید:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "عضویت"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr "نشان تجاری، اطلاعیه‌های کپی رایت و قوانین استفاده برای طرفین ثالث در"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "مرورگر تور | راهنمای مرورگر تور"
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "لوگوی تور "
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "کمک مالی"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "اکنون اهداء کنید"
+"found in our %(link_to_faq)s"
+msgstr ""
+"نشان تجاری، اطلاعیه‌های کپی رایت و قوانین استفاده برای طرفین ثالث در "
+"%(link_to_faq)s"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "بارگیری مرورگر تور"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr ""
 
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "جستجو"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "مرورگر تور | راهنمای مرورگر تور"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "موضوعات"
diff --git a/contents+fr.po b/contents+fr.po
index 46dbca009..c36a7ee27 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1,17 +1,16 @@
 # Translators:
-# Thomas Prévost <thomasprevost85 at gmail.com>, 2019
-# Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
-# erinm, 2019
-# Emma Peel, 2019
+# Emma Peel, 2018
 # AO <ao at localizationlab.org>, 2019
+# erinm, 2019
+# Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: AO <ao at localizationlab.org>, 2019\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,16 +54,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Greffons"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Devenir traducteur de Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "À propos du Navigateur Tor"
 
@@ -100,8 +89,6 @@ msgstr "Gérer les identités"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Services onion"
 
@@ -122,24 +109,31 @@ msgstr "Mise à jour"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Greffons"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Dépannage"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Désinstallation"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problèmes connus"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Devenir traducteur de Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1263,6 +1257,11 @@ msgstr ""
 "circuit, dans le menu des informations du site, dans la barre d’URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "SERVICES ONION"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Services qui ne sont accessibles qu’en utilisant Tor"
@@ -1321,8 +1320,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Accéder à un service onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### COMMENT ACCÉDER À UN SERVICE ONION"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1353,8 +1352,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Dépannage"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### DÉPANNAGE"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2254,6 +2253,11 @@ msgstr ""
 "que vous rencontrez  n’y est pas déjà répertorié."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "PROBLÈMES CONNUS"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2353,6 +2357,11 @@ msgstr ""
 "(page en anglais)."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "DÉSINSTALLATION"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Supprimer le Navigateur Tor de votre système"
@@ -2404,237 +2413,83 @@ msgstr ""
 "Notez que l’utilitaire habituel de désinstallation de votre système "
 "d’exploitation n’est pas utilisé."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "DEVENIR TRADUCTEUR DE TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Devenir traducteur pour le Projet Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Si vous souhaitez aider le projet en traduisant le guide d’utilisation ou le"
-" Navigateur Tor dans votre langue, nous vous serions grandement "
-"reconnaissants de votre aide ! La localisation du Projet Tor est hébergée "
-"par le [Labo de localisation](https://www.localizationlab.org) (site en "
-"anglais) sur Transifex, une plateforme tierce de traduction. Afin de "
-"commencer à contribuer, vous devrez vous inscrire à Transifex. Vous "
-"trouverez ci-dessous un aperçu de la façon de vous inscrire et de commencer."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Avant de traduire, veuillez lire la page du Projet Tor sur le [wiki du Labo "
-"de localisation](https://wiki.localizationlab.org/index.php/Tor) (page en "
-"anglais). Vous y trouverez des directives de traduction et des ressources "
-"qui vous aideront à contribuer aux traductions de Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### S’INSCRIRE SUR TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Rendez-vous sur la [page d’inscription de "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Remplissez les champs avec vos renseignements et cliquez sur le bouton « "
-"S’inscrire » :"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Remplissez la page suivante avec votre nom et choisissez « Localisation » "
-"et « Traducteur » dans les menus déroulants :"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Sur la page suivante, sélectionnez « Se joindre à un projet existant » et "
-"poursuivez."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Sur la page suivante, sélectionnez dans le menu déroulant les langues que "
-"vous parlez et poursuivez."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Vous êtes maintenant inscrit ! Rendez-vous sur la [page Transifex de "
-"Tor](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-"* Cliquez sur le bouton bleu « Se joindre à l’équipe » situé complètement à "
-"droite :"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Sélectionnez dans le menu déroulant la langue vers laquelle vous souhaitez"
-" traduire :"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-"* Une notification comme celle-ci apparaîtra maintenant en haut de la page :"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Une fois que vous serez devenu membre de l’équipe, vous pourrez commencer à "
-"traduire ; vous trouverez une liste des translations dont nous avons besoin "
-"sur [la page Transifex de Tor](https://www.transifex.com/otf/torproject/)."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Télécharger le Navigateur Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"Le [wiki du Labo de "
-"localisation](https://wiki.localizationlab.org/index.php/Tor) (page en "
-"anglais) présente aussi des renseignements sur les traductions prioritaires."
+"Téléchargez le Navigateur Tor afin de découvrir une navigation qui protège "
+"vraiment votre vie privée et vos données personnelles, sans pistage, ni "
+"surveillance, ni censure."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Nous vous remercions de l’intérêt que vous portez au projet !"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Notre mission :"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"faire progresser les droits de la personne et les libertés en créant et en "
-"déployant des technologies gratuites d’anonymat et de protection de la vie "
-"privée et des données personnelles, à code source ouvert. Nous soutenons "
+"Faire progresser les droits de la personne et les libertés en créant et en "
+"déployant des technologies gratuites, à code source ouvert, d’anonymat et de"
+" protection de la vie privée et des données personnelles. Nous soutenons "
 "aussi leur disponibilité et leur utilisation sans restriction en les faisant"
 " mieux connaître des scientifiques et du public."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Faire un don maintenant"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Faire un don maintenant"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "S’abonner à notre lettre d’information"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 "Recevez les mises à jour mensuelles du Projet Tor et les occasions qu’il "
-"offre"
+"offre :"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "S’abonner"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Les avis de marque de commerce, de droit d’auteur et les règles "
-"d’utilisation par des tiers se trouvent dans notre"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Le Projet Tor | Guide d’utilisation du Navigateur Tor"
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo de Tor"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Faire un don maintenant"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "FAIRE UN DON MAINTENANT"
+"d’utilisation par des tiers se trouvent dans notre %(link_to_faq)s"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Télécharger le Navigateur Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Chercher"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Le Projet Tor | Guide d’utilisation du Navigateur Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Sujets"
diff --git a/contents+ga.po b/contents+ga.po
index cdf9700ea..fb4e9d14c 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -53,16 +53,6 @@ msgstr "Teagmháil"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Forlíontáin"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Maidir le Brabhsálaí Tor"
 
@@ -98,8 +88,6 @@ msgstr "Aitheantais a bhainistiú"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Seirbhísí Onion"
 
@@ -120,24 +108,31 @@ msgstr "Nuashonrú"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Forlíontáin"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Fabhtcheartú"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Díshuiteáil"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Fadhbanna ar eolas"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Eolas maidir le haistriúchán Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1204,6 +1199,11 @@ msgstr ""
 "roghchlár a thugann eolas faoin suíomh, sa mbarra URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Seirbhísí ar fáil trí Tor amháin"
@@ -1262,8 +1262,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Conas Seirbhís Onion a rochtain"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1294,8 +1294,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Fabhtcheartú"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2155,6 +2155,11 @@ msgstr ""
 "fhadhb a fheiceann tusa ann cheana."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "FADHBANNA AR EOLAS"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2252,6 +2257,11 @@ msgstr ""
 "tor-isnt-good-idea\">níl sé sábháilte BitTorrent a úsáid le Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Conas Brabhsálaí Tor a bhaint de do chóras"
@@ -2299,207 +2309,71 @@ msgstr ""
 "Tabhair faoi deara nach mbaintear úsáid as an ngnáthuirlis \"Uninstall\" ar "
 "do chóras."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Bí i d'aistritheoir ar Thionscadal Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Cuir do shonraí isteach agus cliceáil an cnaipe 'Sign Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Líon isteach an chéad leathanach eile agus roghnaigh \"Localization\" agus"
-" \"Translator\" ó na roghchláir aníos:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Ar an chéad leathanach eile, roghnaigh 'Join an existing project' agus "
-"lean ar aghaidh."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Ar an chéad leathanach eile, roghnaigh na teangacha ar do thoil agat ón "
-"roghchlár aníos agus lean ar aghaidh."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Cliceáil an cnaipe gorm 'Join Team' ar dheis ar fad:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Roghnaigh do theanga ón roghchlár aníos:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Feicfidh tú fógra ar bharr an leathanaigh mar seo:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Íoslódáil Brabhsálaí Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr " Go raibh maith agat as cabhrú linn!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "An aidhm atá againn:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"cearta daonna agus an tsaoirse a chur chun cinn trí theicneolaíochtaí "
-"oscailte agus saor in aisce a thacaíonn leis an bpríobháideachas ar líne a "
-"fhorbairt, na teicneolaíochtaí seo a scaipeadh gan srian agus a n-úsáid a "
-"spreagadh, agus tuiscint níos fearr ar chúrsaí príobháideachais a fhorbairt "
-"i measc an phobail."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Tabhair síntiús airgid"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Tabhair síntiús airgid anois"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Liostáil lenár Nuachtlitir"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Nuashonruithe agus deiseanna gach mí ó Thionscadal Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-"Gheobhaidh tú eolas faoi thrádmharcanna, cúrsaí cóipchirt, agus rialacha a "
-"bhaineann le tríú páirtithe sa "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tionscadal Tor | Lámhleabhar Bhrabhsálaí Tor"
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Lógó Tor"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Tabhair síntiús airgid"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Íoslódáil Brabhsálaí Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Roghchlár"
 
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Cuardaigh"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tionscadal Tor | Lámhleabhar Bhrabhsálaí Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Topaicí"
diff --git a/contents+he.po b/contents+he.po
index 38c791e83..fd5955db2 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: ION, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -53,16 +53,6 @@ msgstr "צור קשר"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "מתקעים"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tor אודות דפדפן"
 
@@ -98,8 +88,6 @@ msgstr "ניהול זהויות"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "שירותי בצל"
 
@@ -120,24 +108,31 @@ msgstr "עדכון"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "מתקעים"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "פתרון תקלות"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "הסרה"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "סוגיות ידועות"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Tor הפיכה אל מתרגם"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1167,6 +1162,11 @@ msgstr ""
 "בשורת הכתובת."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Tor־שירותים שנגישים רק ע\"י שימוש ב"
@@ -1221,8 +1221,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### כיצד להשיג גישה אל שירות בצל"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1250,8 +1250,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### איתור תקלות"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2073,6 +2073,11 @@ msgstr ""
 "הבעיה שאתה חווה כבר נמצאת ברשימה שם."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2165,6 +2170,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">אינו אלמוני על גבי Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "איך להסיר את דפדפן Tor מהמערכת שלך"
@@ -2209,215 +2219,71 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "שים לב שהתועלת התקנית ”הסרה” של מערכת ההפעלה שלך אינה בשימוש."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Tor הפיכה אל מתרגם עבור מיזם"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"אם אתה אתה מעונין לעזור למיזם ע\"י תרגום של המדריך או דפדפן Tor לעברית, "
-"עזרתך תוערך במידה רבה! המקמת מיזם Tor מאורחת ברכזת [Localization "
-"Lab](https://www.localizationlab.org) ב־Transifex, כלי צד־שלישי של תרגום. על"
-" מנת להתחיל לתרום תהיה חייב להירשם אל Transifex. למטה יש קו־מתאר של איך "
-"להירשם ולהתחיל."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"לפני שתתרגם, אנא קרא את דף מיזם Tor בכתובת [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). שם תימצא קווים מנחים "
-"של תרגום וכן משאבים שיעזרו לך לתרום אל תרגומי Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* נווט אל <a href=\"https://transifex.com/signup/\">מוד ההרשמה של "
-"Transifex</a>."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "הכנס את המידע שלך לתוך השדות ולחץ על הכפתור 'הירשם':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr "* מלא את העמוד הבא בשמך ובחר \"המקמה\" ו\"מתרגם\" מתוך התפריטים הנפתחים מטה:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr "* בעמוד הבא, בחר 'הצטרף אל מיזם קיים' והמשך."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr "* בעמוד הבא, בחר את השפות שאתה מדבר מתוך התפריטים הנפתחים מטה והמשך."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* אתה רשום כעת! לך אל <a "
-"href=\"https://www.transifex.com/otf/torproject/\">עמוד Transifex של "
-"Tor</a>."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* לחץ על הכפתור הכחול 'הצטרף לצוות' בימין הרחוק:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* בחר את השפה שתרצה לתרגם מתוך התפריט הנפתח מטה:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* התראה תופיע כעת בראש העמוד בצורה כזאת:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"לאחר שחברותך תאושר, תוכל להתחיל לתרגם; פשוט נווט חזרה אל <a "
-"href=\"https://www.transifex.com/otf/torproject/\">עמוד Transifex של Tor</a>"
-" כשאתה מוכן להתחיל."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "הורד את דפדפן Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "תודה על התעניינותך בעזרה למיזם!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "המשימה שלנו:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"כדי לקדם זכויות אדם וחירויות ע\"י יצירה ופריסה של טכנולוגיות של אלמוניות "
-"ופרטיות בקוד פתוח וחינמי, תמיכה בזמינות ובשימוש בלתי־מוגבל שלהן, וקידום הבנה"
-" מדעית ועממית שלהן."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "תרום"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "תרום עכשיו"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "הירשם כמנוי לידיעון שלנו"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "קבל עדכונים חודשיים והזדמנויות ממיזם Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "קבל עדכונים חודשיים והזדמנויות ממיזם Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "הירשם"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"סימן מסחרי, הערות זכויות יוצרים וכללים עבור שימוש ע\"י צדדים שלישיים יכולים "
-"להימצא במקומות "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "מיזם Tor | מדריך דפדפן Tor"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "סמליל Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "תפריט"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "תרום"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "הורד את דפדפן Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "חיפוש"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "מיזם Tor | מדריך דפדפן Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "נושאים"
diff --git a/contents+hr.po b/contents+hr.po
index b125ba573..30065b457 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -1,15 +1,15 @@
 # Translators:
 # Karlo Prikratki <karlo at karloprikratki.com>, 2018
-# erinm, 2019
 # Emma Peel, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,16 +53,6 @@ msgstr "kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Dodatci"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "O Tor Browseru"
 
@@ -98,8 +88,6 @@ msgstr "Upravljanje identitetitma"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion usluge"
 
@@ -120,24 +108,31 @@ msgstr "Ažuriranje"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Dodatci"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Rješavanje problema"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Deinstaliranje"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Poznati problemi"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1139,6 +1134,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Usluge koje su dostupne jedino korištenjem Tora"
@@ -1195,8 +1195,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Kako pristupiti onion uslugama"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1221,8 +1221,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Rješavanje problema"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2054,6 +2054,11 @@ msgstr ""
 "problemima</a> da vidite ako je problem kojeg imate tamo prikazan."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2147,6 +2152,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Kako ukloniti Tor Browser iz Vašeg sustava"
@@ -2194,199 +2204,71 @@ msgstr ""
 "Napominjemo da se mogućnost \"Deinstaliraj\" unutar Vašeg operativnog "
 "sustava ne koristi."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Unesite vaše informacije u polja i kliknite na \"Sign Up\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Ispunite sljedeću stranicu s vašim imenom i odaberite \"Localization\" i "
-"\"Translator\" s padajućih izbornika:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Na sljedećoj stranici, odaberite 'Join an existing project' i nastavite."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Na sljedećoj stranici, odaberite jezike koje govorite s padajućeg "
-"izbornika i nastavite."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Kliknite plavi 'Join Team' gumb na desnoj strani:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* S padajućeg izbornika odaberite jezik koji želite prevoditi:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Na vrhu stranice će se sada pojaviti obavijest:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Kako preuzeti Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donirajte"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donirajte"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Prijavite se"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donirajte"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Kako preuzeti Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Traži"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr ""
diff --git a/contents+hu.po b/contents+hu.po
index f14935d79..ce9499da8 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -1,5 +1,4 @@
 # Translators:
-# Gercuj Bence <bencegercuj at gmail.com>, 2019
 # Emma Peel, 2019
 # erinm, 2019
 # vargaviktor <viktor.varga at gmail.com>, 2019
@@ -9,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: István Dávid <istvandavid at icloud.com>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
@@ -55,16 +54,6 @@ msgstr "Kapcsolat"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Kiegészítők"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Válj Tor fordítóvá"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "A Tor Browser névjegye"
 
@@ -100,8 +89,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Szolgáltatások"
 
@@ -122,24 +109,31 @@ msgstr "Frissítés"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Kiegészítők"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Hibaelhárítás"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Eltávolítása"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Ismert problémák"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Tor fordítóvá válás"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1097,6 +1091,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1141,8 +1140,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Hogyan lehet elérni egy Onion szolgáltatást"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1167,8 +1166,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Hibakeresés"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1922,6 +1921,11 @@ msgstr ""
 "szerepel-e ott."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2018,6 +2022,11 @@ msgstr ""
 "felett</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Hogyan távolítható el a Tor Browser a rendszerből"
@@ -2065,222 +2074,71 @@ msgstr ""
 "Ne feledje, hogy az operációs rendszer szabványos „Uninstall” "
 "segédprogramját nem tudja használni."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Csatlakozz a Tor Projekt fordítói közé"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Ha szeretnéd segíteni a projektet a kézikönyv vagy a Tor Browser nyelvének "
-"lefordításával, a segítségedet nagyra értékeljük! A Tor Project "
-"lokalizációja a [Localization Lab](https://www.localizationlab.org) Hubban "
-"található a Transifex-en, egy harmadik fél fordítóeszközén. A hozzájárulás "
-"megkezdéséhez be kell jelentkezned a Transifex-szel. Az alábbiakban "
-"bemutatjuk, hogyan kell bejelentkezed és hozzálátnod."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Fordítás előtt olvassa el a Tor Project oldalt a [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) oldalon. Itt fordítási"
-" iránymutatásokat és forrásokat talál, amelyek segítenek a Tor "
-"fordításaihoz."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Menjen át a [Transifex regisztrációs "
-"oldalra](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Írja be az adatait a mezőkbe, és kattintson a \"Regisztráció\" gombra:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Adja meg a nevét a következő oldalon, majd válassza ki a \"Lokalizáció\" "
-"és \"Fordító\" opciókat a legördülő listából:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* A következő oldalon válassza a \"Csatlakozás egy meglévő projekthez\" "
-"lehetőséget, és folytassa."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* A következő oldalon válassza ki a legördülő menüből a beszélt nyelveket és"
-" folytassa."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Sikeresen regisztrált! Lépjen a [Tor Transifex "
-"oldalra](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Kattintson a kék \"Csatlakozzon a csapathoz\" gombra a jobb oldalon:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Válassza ki a lefordítandó nyelvet a legördülő menüből:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Az értesítés megjelennek az oldal tetején:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"A tagság jóváhagyása után elkezdheti a fordítást; van egy lista a szükséges "
-"fordításokról a [Tor Transifex "
-"oldalon](https://www.transifex.com/otf/torproject/), amikor készen áll a "
-"kezdésre."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor Browser letöltése"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"A [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) is"
-" fontosabb információkat tartalmaz a fordításokról."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Köszönjük, hogy érdeklődését felkeltette a projektet!"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Küldetésünk:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Támogatás"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Támogasson most"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Iratkozzon fel hírlevelünkre"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Regisztráció"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"A védjegy, a szerzői jogi nyilatkozatok és a harmadik felek által használt "
-"szabályok megtalálhatók a"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Tor Browser kézikönyv"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menü"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Támogatás"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Tor Browser letöltése"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Keresés"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser kézikönyv"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Témák"
diff --git a/contents+id.po b/contents+id.po
index 65294df2f..ae5f8d891 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: ical, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -55,16 +55,6 @@ msgstr "Kontak"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugin"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Menjadi Penerjemah Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tentang Tor Browser"
 
@@ -100,8 +90,6 @@ msgstr "Mengelola identitas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Layanan Onion"
 
@@ -122,24 +110,31 @@ msgstr "Pembaruan"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugin"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Tawaran solusi"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Pencopotan"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Persoalan yang telah diketahui"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Menjadi Penerjemah Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1250,6 +1245,11 @@ msgstr ""
 "informasi situs, di dalam kolom URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "LAYANAN ONION"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Layanan hanya bisa diakses menggunakan Tor"
@@ -1307,8 +1307,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Cara mengakses sebuah layanan onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1340,8 +1340,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Tawaran solusi"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2225,6 +2225,11 @@ msgstr ""
 "persoalanmu sudah masuk ke dalam daftar ini."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2321,6 +2326,11 @@ msgstr ""
 "tor-isnt-good-idea\">tidak anonim di dalam Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Cara mencopot Tor Browser dari sistem Anda"
@@ -2372,224 +2382,79 @@ msgstr ""
 "Perhatikan operating sistem anda standard \"Uninstall\" utilitas tidak "
 "digunakan."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "MENJADI PENERJEMAH TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Menjadi penerjemah untuk Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Jika Anda tertarik membantu proyek ini dengan menerjemahkan manual atau Tor "
-"Browser ke bahasa Anda, bantuan Anda akan sangat diapresiasi! Lokalisasi Tor"
-" Project dihosting di [Localization Lab](https://www.localizationlab.org) "
-"Hub pada Transifex, sebuah alat penerjemah pihak ketiga. Untuk memulai "
-"berkontribusi Anda harus mendaftar di Transifex. Dibawah ini adalah skema "
-"dari bagaimana caranya mendaftar dan memulai."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Sebelum menerjemahkan, mohon baca halaman Tor Project pada [Localization Lab"
-" Wiki](https://wiki.localizationlab.org/index.php/Tor). Di sana Anda akan "
-"menemukan petunjuk penerjemahan dan sumber daya yang akan membantu anda "
-"berkontribusi pada penerjemahan Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "###### MENDAFTAR DI TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Pergi ke [halaman pendaftaran Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Masukkan informasi Anda pada kolom-kolom dan klik tombol 'Sign Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Isi halaman berikutnya dengan nama Anda dan pilih \"Localization\" dan "
-"\"Translator\" dari menu drop down:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Pada halaman berikutnya, pilih 'Join an existing project' dan lanjutkan."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Pada halaman berikutnya, pilih bahasa yang Anda gunakan dari menu drop "
-"down dan lanjutkan."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Anda telah terdaftar! Pergi ke [halaman Transifex "
-"Tor](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Klik tombol 'Join Team' berwarna biru pada bagian paling kanan:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Pilih bahasa yang ingin Anda terjemahkan dari menu drop down:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Sebuah notifikasi akan muncul pada bagian atas halaman seperti ini:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Setelah keanggotaan Anda diterima Anda dapat memulai menerjemahkan; ada "
-"daftar penerjemahan yang dibutuhkan pada [halaman Transifex "
-"Tor](https://www.transifex.com/otf/torproject/) saat Anda siap untuk "
-"memulai."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Unduh Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) juga"
-" memiliki informasi tentang penerjemahan dengan prioritas yang lebih besar."
+"Unduh Tor Browser untuk pengalaman penjelajahan privat yang sesungguhnya "
+"tanpa pelacakan, pengawasan, atau penyensoran."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Terima kasih atas minat Anda membantu proyek ini!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Misi kami:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"untuk memajukan hak asasi manusia dan kebebasan dengan menciptakan dan "
+"Untuk memajukan hak asasi manusia dan kebebasan dengan menciptakan dan "
 "menyebarkan anonimitas dan teknologi privasi gratis dan terbuka, mendukung "
 "ketersediaan dan penggunaan tak terbatas mereka, dan memajukan pemahaman "
 "ilmiah dan populer mereka."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donasi"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donasi Sekarang"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Berlangganan Newsletter kami"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Dapatkan pembaruan bulanan dan peluang dari Proyek Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Dapatkan pembaruan bulanan dan peluang dari Proyek Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Daftar"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Merek dagang, pemberitahuan hak cipta, dan peraturan untuk digunakan oleh "
-"pihak ketiga dapat ditemukan pada kami"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manual Tor Browser"
+"pihak ketiga dapat ditemukan pada kami %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donasi"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONASI SEKARANG"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Unduh Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Cari"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manual Tor Browser"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Topik-topik"
diff --git a/contents+is.po b/contents+is.po
index fcfd851a5..8e828e183 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>, 2019\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
@@ -52,16 +52,6 @@ msgstr "Hafa samband"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Viðbætur"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Að gerast Tor-þýðandi"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Um Tor-vafrann"
 
@@ -97,8 +87,6 @@ msgstr "Sýsl með persónuauðkenni"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion-þjónustur"
 
@@ -119,24 +107,31 @@ msgstr "Uppfærsla"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Viðbætur"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Lausn á vandamálum"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Taka út uppsetningu"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Þekkt vandamál"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Að gerast Tor-þýðandi"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1246,6 +1241,11 @@ msgstr ""
 " upplýsingavalmynd vefsvæðisins á staðsetningastikunni."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION ÞJÓNUSTUR"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Þjónustur sem enungis eru aðgengilegar í gegnum Tor"
@@ -1304,8 +1304,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Hvernig er hægt að tengjast onion-þjónustu"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### HVERNIG FÆST AÐGANGUR AÐ ONION-ÞJÓNUSTU"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1336,8 +1336,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Lausn á vandamálum"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### LAUSN Á VANDAMÁLUM"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2225,6 +2225,11 @@ msgstr ""
 "þar."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ÞEKKT VANDAMÁL"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2322,6 +2327,11 @@ msgstr ""
 " nafnlaus í gegnum Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "TAKA ÚT UPPSETNINGU"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Hvernig á að fjarlægja Tor-vafrann úr tölvunni"
@@ -2373,228 +2383,82 @@ msgstr ""
 "Athugaðu að venjulega \"Taka út forrit\" eining stýrikerfisins þíns er ekki "
 "notuð."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "AÐ GERAST TOR-ÞÝÐANDI"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Að gerast þýðandi fyrir Tor-verkefnið"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Ef þú hefur áhuga á að hjálpa til við að þýða hotendahandbókina eða Tor-"
-"vafrann yfir á móðurmálið þitt, væri það meira en vel þegið! Staðfærsla Tor-"
-"verkefnisins er hýst á [Localization Lab](https://www.localizationlab.org) "
-"svæðinu á Transifex, sem er utanaðkomandi þýðingakerfi. Til þess að geta "
-"lagt þitt af mörkum þar, þarftu að skrá þig hjá Transifex. Hér fyrir neðan "
-"eru grófar leiðbeiningar um hvernig hægt er að skrá sig og hefjast handa."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Áður en byrjað er að þýða ættirðu að lesa síðu Tor-verkefnisins á [wiki-"
-"svæði Localization Lab](https://wiki.localizationlab.org/index.php/Tor). Þar"
-" finnurðu leiðbeiningar varðandi þýðingavinnuna og ýmis tilföng sem geta "
-"hjálpað við þýðingar á Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### NÝSKRÁ SIG Á TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr "* Farðu yfir á [nýskráningarsíðu](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Settu inn upplýsingar um þig í reitina og smelltu á 'Nýskrá'-hnappinn:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Fylltu út næstu síðu með nafninu þínu og veldu einnig "
-"\"Staðfærsla/Localization\" og \"Þýðandi/Translator\" úr fellilistanum:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Á næstu síðu skaltu velja 'Ganga til liðs við fyrirliggjandi verkefni' og "
-"halda síðan áfram."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Á næstu síðu skaltu velja úr fellilistanum þau tungumál sem þú skilur og "
-"halda síðan áfram."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Þú hefur nú verið skráð(ur)! Farðu yfir á [Transifex-síðu "
-"Tor](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Smelltu á 'Ganga í teymið' hnappinn lengst til hægri:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Veldu tungumálið sem þú vill senda inn þýðingar fyrir úr fellivalmyndinni:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Tilkynning mun nú birtast efst á síðunni eins og hér er sýnt:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Eftir að aðild þín hefur verið samþykkt, geturðu byrjað að þýða; farðu til "
-"baka á [Transifex-síðu Tor(https://www.transifex.com/otf/torproject/) þegar "
-"þú ert klár í að hefjast handa."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Sæktu Tor-vafrann"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Wiki-síða Localization Lab](https://wiki.localizationlab.org/index.php/Tor)"
-" er einnig með upplýsingar um hvaða þýðingaskrár séu í sérstökum forgangi."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Takk fyrir að sýna áhuga á að hjálpa til við verkefnið!"
+"Sæktu Tor-vafrann til að upplifa raunverulegt einkavafur án eftirlits, "
+"skráningar á hegðun þinni eða ritskoðun."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Markmið okkar:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"að hafa mannréttindi og frelsi að leiðarljósi og stefna að þeim markmiðum "
+"Að hafa mannréttindi og frelsi að leiðarljósi og stefna að þeim markmiðum "
 "með gerð og útbreiðslu á tækni til verndar persónuupplýsingum. Sú tækni eigi"
 " að vera öllum frjáls og heimil til notkunar, vera opin til skoðunar, enda "
 "sé eitt markmiðanna að stuðla að bættum almennum og vísindalegum skilningi á"
 " þessum málum."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Styrkja"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Styrkja núna"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Gerstu áskrifandi að fréttabréfinu okkar"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 "Fáðu mánaðarlegar tilkynningar um uppfærslur og ýmsa möguleika frá Tor-"
-"verkefninu"
+"verkefninu:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Skráðu þig"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Athugasemdir varðandi vörumerki, höfundarrétt, og reglur fyrir notkun "
-"utanaðkomandi aðila er hægt að skoða í"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Notendahandbók Tor-vafrans"
+"utanaðkomandi aðila er hægt að skoða í %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Táknmerki Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Valmynd"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Styrkja"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "STYRKJA NÚNA"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Sæktu Tor-vafrann"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Leita"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Notendahandbók Tor-vafrans"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Umfjöllunarefni"
diff --git a/contents+it.po b/contents+it.po
index 0208a67f7..f4e1670d9 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -2,19 +2,19 @@
 # Emanuele Trotta <etrotta at grupposintesi.it>, 2018
 # Random_R, 2019
 # francesco ercolani <erco99 at live.it>, 2019
+# Lorenzo Mazza <lor.mazza81 at outlook.com>, 2019
 # erinm, 2019
-# Davide Sant <spuuu at outlook.it>, 2019
 # Emma Peel, 2019
 # Giandomenico Lombardi <transifex.com at l1t.it>, 2019
-# Lorenzo Mazza <lor.mazza81 at outlook.com>, 2019
+# Davide Sant <spuuu at outlook.it>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Lorenzo Mazza <lor.mazza81 at outlook.com>, 2019\n"
+"Last-Translator: Davide Sant <spuuu at outlook.it>, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,16 +58,6 @@ msgstr "Contatti"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugin"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Diventa un traduttore Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Informazioni su Tor Browser"
 
@@ -103,8 +93,6 @@ msgstr "Gestire le identità"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Servizi onion"
 
@@ -125,24 +113,31 @@ msgstr "Aggiorna"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugin"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Risoluzione dei problemi"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Disinstalla"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problemi conosciuti"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Diventare un traduttore Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -587,7 +582,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "##### ENTERING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "##### INSERIRE GLI INDIRIZZI DEI PONTI"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -595,7 +590,7 @@ msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
 msgstr ""
-"Una volta che hai ottenuto degli indirizzi di ponti, dovrai inserirli nel "
+"Una volta che hai ottenuto degli indirizzi dei ponti, dovrai inserirli nel "
 "Launcher Tor."
 
 #: https//tb-manual.torproject.org/bridges/
@@ -1250,6 +1245,11 @@ msgstr ""
 "informazioni del sito, nella barra URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Servizi accessibili solo attraverso la rete Tor"
@@ -1308,8 +1308,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Come accedere ad un servizio onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1340,8 +1340,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Risoluzione dei problemi"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2195,6 +2195,11 @@ msgstr ""
 "incontrando è già stato inserito nella pagina."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2293,6 +2298,11 @@ msgstr ""
 "Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Come rimuovere il browser Tor dal sistema"
@@ -2345,227 +2355,79 @@ msgstr ""
 "Nota che l'applicazione standard per disinstallare i programmi non verrà "
 "utilizzata."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Diventare un traduttore di Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Se sei interessato ad aiutare il progetto traducendo il manuale o Tor "
-"Browser nella tua lingua, il tuo aiuto sarebbe molto apprezzato! La "
-"localizzazione di Tor Browser è ospitata nel [Localization "
-"Lab](https://www.localizationlab.org) Hub su Transifex, uno strumento di "
-"traduzione di terze parti. Per iniziare a contribuire dovrai registrarti su "
-"Transifex. Di seguito è riportato uno schema di come iscriversi e iniziare."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Prima di tradurre, leggi la pagina del Progetto Tor nella [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). Lì troverai le linee "
-"guida di traduzione e le risorse che ti aiuteranno a contribuire alle "
-"traduzioni di Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Andate sulla [pagina di iscrizione a "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Inserisci le tue informazioni nei campi e clicca il pulsante 'Sign Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Compila la pagina successiva con il tuo nome e seleziona \"Localization\" "
-"e \"Translator\" dai menu a tendina:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Nella pagina successiva, seleziona 'Join an existing project' e continua."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Nella pagina successiva, seleziona le lingue che parli dal menu a tendina "
-"e continua."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"Ora sei iscritto! Vai a [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Clicca il pulsante blu 'Join Team' a destra:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Seleziona la lingua che vorresti tradurre dal menu a tendina:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Una notifica apparirà in cima alla pagina in questo modo:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Dopo che la tua adesione è stata approvata puoi iniziare a tradurre; c'è una"
-" lista di traduzioni richieste alla [pagina di Tor "
-"Transifex](https://www.transifex.com/otf/torproject/) per quando sei pronto "
-"per iniziare."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Scarica Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"Il [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"contiene inoltre informazioni riguardo alle traduzioni con maggiore "
-"priorità."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Grazie per il tuo interesse ad aiutare il progetto!"
+"Scarica Tor Browser per provare la vera navigazione privata senza "
+"tracciamento, sorveglianza o censure."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "La nostra missione:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"far progredire i diritti umani e la libertà creando e distribuendo software "
+"Far progredire i diritti umani e la libertà creando e distribuendo software "
 "gratuito ed open source con tecnologie per rendersi anonimi e mantenere la "
 "privacy, favorendone l'ampia disponibilità ed utilizzo e promuovendone la "
 "comprensione scientifica e popolare."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Dona"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Dona Adesso"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Iscriviti alla nostra Newsletter"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Ricevi aggiornamenti mensili e altre occasioni dal Progetto Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Ricevi aggiornamenti mensili e altre occasioni dal Progetto Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Iscriviti"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Marchio registrato, avvertenze sul copyright e regole per l'utilizzo da "
-"terzi possono essere trovati nel nostro "
+"terzi possono essere trovati nel nostro %(link_to_faq)s"
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manuale Browser Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Dona"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONA ORA"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Scarica Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Cerca"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manuale Browser Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Argomenti"
diff --git a/contents+ja.po b/contents+ja.po
index d1e80e380..c085cdaf7 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -1,16 +1,16 @@
 # Translators:
-# 323484, 2018
 # erinm, 2019
 # Emma Peel, 2019
 # Tokumei Nanashi, 2019
+# 323484, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Tokumei Nanashi, 2019\n"
+"Last-Translator: 323484, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +54,6 @@ msgstr "連絡先"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Torの翻訳者になる法方"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tor Browser について"
 
@@ -99,8 +89,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "オニオンサービス"
 
@@ -121,24 +109,31 @@ msgstr "アップデート"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "問題の解決"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "アンインストール"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "既知の問題"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1021,6 +1016,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1088,8 +1088,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### 問題の解決"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1826,6 +1826,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1906,6 +1911,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Tor Browser をシステムから取り除くには"
@@ -1950,192 +1960,69 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "OS 標準の「アンインストール」ユーティリティーは使用しません。"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "寄付"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "今すぐ寄付"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "登録"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor ロゴ"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "寄付"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "メニュー"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+ka.po b/contents+ka.po
index 987cca6fb..0cbb2e5c4 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Georgianization, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -53,16 +53,6 @@ msgstr "კავშირი"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "მოდულები"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "გახდით Tor-ის მთარგმნელი"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tor-ბრაუზერის შესახებ"
 
@@ -98,8 +88,6 @@ msgstr "ვინაობის მონაცემების მართ
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion-მომსახურებები"
 
@@ -120,24 +108,31 @@ msgstr "განახლება"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "მოდულები"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "გაუმართაობის აღმოფხვრა"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "ამოშლა"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "ცნობილი ხარვეზები"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "გახდით Tor-ის მთარგმნელი"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1244,6 +1239,11 @@ msgstr ""
 "ველში მდებარე საიტის მონაცემების მენიუდან."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION-მომსახურებები"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "მომსახურებები, რომლებიც მხოლოდ Tor-იდანაა ხელმისაწვდომი"
@@ -1302,8 +1302,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### როგორ ხდება Onion-მომსახურებასთან წვდომა"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### წვდომის მიღება ONION-მომსახურებებთან"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1334,8 +1334,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### გაუმართაობის აღმოფხვრა"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### ხარვეზების მოგვარება"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2218,6 +2218,11 @@ msgstr ""
 "აღრიცხულია თუ არა მოცემულ ჩამონათვალში."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ცნობილი ხარვეზები"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2319,6 +2324,11 @@ msgstr ""
 "თემაზე</a></mark>"
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "ამოშლა"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "როგორ ხდება Tor-ბრაუზერის სისტემიდან ამოშლა"
@@ -2370,174 +2380,27 @@ msgstr ""
 "გაითვალისწინეთ, რომ თქვენი სისტემის „პროგრამების ამოშლის“ ჩვეულებრივი "
 "ხელსაწყო არ გამოიყენება."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "გახდით TOR-ის მთარგმნელი"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "გახდით მთარგმნელი Tor-პროექტში"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"თუ გსურთ დაეხმაროთ პროექტს სახელმძღვანელოს ან Tor-ბრაუზერის გადათარგმნაში "
-"თქვენს ენაზე, მეტად მადლიერნი დაგრჩებით! Tor-პროექტის თარგმნა ხდება "
-"[Localization Lab](https://www.localizationlab.org) Transifex-საიტზე, "
-"თარგმნის გასაიოლებელ ხელსაწყოზე. წვლილის შეტანის დასაწყებად, საჭიროა "
-"ანგარიშის შექმნა Transifex-ზე. ქვემოთ მოცემულია მითითებები, თუ როგორ ხდება "
-"ანგარიშის შექმნა და მუშაობის დაწყება."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"თარგმნის დაწყებამდე, გთხოვთ იხილოთ Tor-პროექტის გვერდი [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). სადაც, მონახავთ "
-"თარგმნის მითითებებსა და სხვა საჭირო მასალებს, რომლებიც დაგეხმარებათ Tor-ის "
-"თარგმნაში წვლილის შესატანად."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### შექმენით ანგარიში TRANSIFEX-ზე"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* გადადით [Transifex-ის ანგარიშის შექმნის "
-"გვერდზე](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"შეიყვანეთ თქვენი მონაცემები შესაბამის ველებში და დააწყაპეთ „Sign up“ ღილაკს:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* შეიყვანეთ შემდეგ გვერდზე თქვენი სახელი და მიუთითეთ „Localization“ და "
-"„Translator“ ჩამოსაშლელი მენიუდან."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* შემდეგ გვერდზე, აირჩიეთ „Join an existing project“ პროექტში ჩასართავად."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* მომდევნო გვერდზე კი აირჩიეთ ენა, რომელზეც საუბრობთ, ჩამოსაშლელი მენიუდან "
-"და განაგრძეთ."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* თქვენი ანგარიში უკვე შექმნილია! გადადით [Tor-ის Transifex-"
-"გვერდზე](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-"* დააწკაპეთ მარჯვნივ არსებულ ლურჯ ღილაკს „Join Team“ გუნდში შემოერთებისთვის:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* მიუთითეთ ენა, რომლიდანაც გსურთ თარგმნოთ, ჩამოსაშლელი მენიუდან:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* შეტყობინება ნაჩვენები იქნება გვერდის თავში ამგვარად:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"მას შემდეგ, რაც თქვენი წევრად მიღება დადასტურდება, შეგეძლებათ თარგმნის "
-"დაწყება; უბრალოდ გადადით უკან <a "
-"href=\"https://www.transifex.com/otf/torproject/\">Tor-ის Transifex-"
-"გვერდზე</a>, როდესაც მზად იქნებით მუშაობის დასაწყებად."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor-ბრაუზერის ჩამოტვირთვა"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"თარგმნის შესახებ მნიშვნელოვანი მასალა, ასევე შეგიძლიათ იხილოთ საიტზე "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "გმადლობთ, დახმარების სურვილის გამოჩენისთვის!"
+"ჩამოტვირთეთ Tor-ბრაუზერი ნამდვილი პირადი თვალიერების რეჟიმის გამოსაცდელად, "
+"თვალის დევნების, ზედამხედველობისა და ცენზურის გარეშე."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "ჩვენი მიზანი:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
@@ -2549,52 +2412,49 @@ msgstr ""
 "დაკავშირებით, მეცნიერული გაგებისა და  საზოგადოების ცნობიერების დონის "
 "ამაღლებით."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "შემოწირულობა"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "გაიღეთ თანხა"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "გამოიწერეთ ჩვენი სიახლეების ცნობარი"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr ""
-"გაეცანით ყოველთვიურად Tor-პროექტთან დაკავშირებულ ახალ ამბებსა და ახალ "
-"შესაძლებლობებს"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "მიიღეთ სიახლეები და ცნობები Tor-პროექტისგან:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "გამოწერა"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"სავაჭრო ნიშნების, საავტორო უფლებების დაცვის განაცხადებისა და მესამე მხარის "
-"მიერ გამოსაყენებელი წესების თაობაზე, შეგიძლიათ იხილოთ ჩვენი"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor-პროექტი | Tor-ბრაუზერის სახელმძღვანელო"
+"მესამე მხარის სავაჭრო ნიშნების, საავტორო შენიშვნებისა და გამოყენების "
+"პირობების შესახებ, იხილეთ ჩვენი %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "როგორ მუშაობს Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "მენიუ"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "შემოწირულობა"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "გაიღეთ თანხა"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Tor-ბრაუზერის ჩამოტვირთვა"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "ძებნა"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor-პროექტი | Tor-ბრაუზერის სახელმძღვანელო"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "საკითხები"
diff --git a/contents+ko.po b/contents+ko.po
index 3225e07d7..d1efa014e 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -1,7 +1,7 @@
 # Translators:
 # Philipp Sauter <qt123 at pm.me>, 2018
-# Johnny Cho <popeye92 at gmail.com>, 2019
 # erinm, 2019
+# Johnny Cho <popeye92 at gmail.com>, 2019
 # Emma Peel, 2019
 # park seungbin <parksengbin48 at gmail.com>, 2019
 # 
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: park seungbin <parksengbin48 at gmail.com>, 2019\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -55,16 +55,6 @@ msgstr "문의"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "플러그인"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Tor 번역에 도움주기"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tor 브라우저에 대해서"
 
@@ -100,8 +90,6 @@ msgstr "개인정보 관리"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion 서비스"
 
@@ -122,24 +110,31 @@ msgstr "업데이트중"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "플러그인"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "문제 해결 - 문제가 있으신가요?"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "제거"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "알려진 문제"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1016,6 +1011,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1060,8 +1060,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Onion 서비스를 접속하는 방법"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1083,8 +1083,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### 문제 해결 - 문제가 있으신가요?"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1805,6 +1805,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1885,6 +1890,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "삭제중"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr ""
@@ -1927,147 +1937,25 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Tor Project 번역에 도움주기"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor 브라우저 다운로드"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "우리의 사명"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
@@ -2075,48 +1963,47 @@ msgstr ""
 "자유/오픈 소스 소프트웨어를 이용한 익명성 및 개인 정보 보호 기술을 개발 및 배포하고 이러한 기술의 제한 없는 가용성과 사용을 지원하며"
 " 과학적 및 대중적 이해를 촉진함으로써 인권과 자유를 증진하는 것입니다."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "후원하기"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "기부하기"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "뉴스레터 구독하기"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Tor 프로젝트에 대한 월간 정보를 받아보세요"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Tor 프로젝트에 대한 월간 정보를 받아보세요:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "회원 등록"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr "상표, 저작권 고지 및 규칙의 제3자의 사용에 대한 정보는"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor 프로젝트 | Tor 브라우저 설명서"
+"found in our %(link_to_faq)s"
+msgstr "상표, 저작권 고지 및 규칙의 제3자의 사용에 대한 정보는%(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor 로고"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "메뉴"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "후원하기"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "기부하기"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Tor 브라우저 다운로드"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "검색"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor 프로젝트 | Tor 브라우저 설명서"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "주제"
diff --git a/contents+lt.po b/contents+lt.po
index cddf683d3..1975f271e 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -1,16 +1,16 @@
 # Translators:
-# Benas Buivydas <benas at perfitect.net>, 2018
 # erinm, 2019
-# Moo, 2019
 # Tautvydas Ž., 2019
+# Moo, 2019
+# Benas Buivydas <benas at perfitect.net>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Tautvydas Ž., 2019\n"
+"Last-Translator: Benas Buivydas <benas at perfitect.net>, 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +54,6 @@ msgstr "Kontaktai"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Įskiepiai"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Tapimas Tor vertėju"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Apie Tor Browser"
 
@@ -99,8 +89,6 @@ msgstr "Tapatybių tvarkymas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion svetainės"
 
@@ -121,24 +109,31 @@ msgstr "Atnaujinimas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Įskiepiai"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Nesklandumų šalinimas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Šalinimas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Žinomos problemos"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1056,6 +1051,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1100,7 +1100,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1123,8 +1123,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Nesklandumų šalinimas"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1849,6 +1849,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1931,6 +1936,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Kaip pašalinti Tor Browser iš savo sistemos"
@@ -1973,194 +1983,71 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Mūsų misija:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Paaukoti"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Paremkite dabar"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registruotis"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Meniu"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor logotipas"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Paaukoti"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "PAAUKOKITE DABAR"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr ""
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Ieškoti"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Temos"
diff --git a/contents+lv.po b/contents+lv.po
index 309bdf6cb..b3b9a0366 100644
--- a/contents+lv.po
+++ b/contents+lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
@@ -52,16 +52,6 @@ msgstr "Sazināties"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Spraudņi"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Par pārlūku Tor"
 
@@ -97,8 +87,6 @@ msgstr "Identitāšu pārvaldīšana"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -119,24 +107,31 @@ msgstr "Jaunināšana"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Spraudņi"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Problēmu novēršana"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Atinstalēšana"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Zināmās problēmas"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1072,6 +1067,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Pakalpojumi, kam var piekļūt vienīgi ar Tor"
@@ -1120,7 +1120,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1143,7 +1143,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1934,6 +1934,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2029,6 +2034,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Kā no Jūsu sistēmas noņemt pārlūku Tor"
@@ -2076,194 +2086,71 @@ msgstr ""
 "Ievērojiet, ka netiek lietota Jūsu operētājsistēmas standarta utilīta "
 "„Atinstalēt”."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Lejuplādēt Pārlūku Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Ziedojiet"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr ""
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Pārlūka Tor lietotāja rokasgrāmata"
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Ziedojiet"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Lejuplādēt Pārlūku Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Meklēt"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Pārlūka Tor lietotāja rokasgrāmata"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr ""
diff --git a/contents+mk.po b/contents+mk.po
index ac490940b..0d951897b 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -1,17 +1,17 @@
 # Translators:
-# Zarko Gjurov <zarkogjurov at gmail.com>, 2018
-# Liljana Ackovska <liljanagjurova at gmail.com>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # Matej Plavevski <matej.plavevski+github at gmail.com>, 2019
+# Emma Peel, 2019
+# Zarko Gjurov <zarkogjurov at gmail.com>, 2019
+# Liljana Ackovska <liljanagjurova at gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Matej Plavevski <matej.plavevski+github at gmail.com>, 2019\n"
+"Last-Translator: Liljana Ackovska <liljanagjurova at gmail.com>, 2019\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,16 +55,6 @@ msgstr "Контакт"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Станете Tor преведувач"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "За Tor Browser"
 
@@ -100,8 +90,6 @@ msgstr "Управување со идентитети"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Услуги"
 
@@ -122,24 +110,31 @@ msgstr "Ажурирање"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Решавање проблеми"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Деинсталирање"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Познати проблеми"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Станете Tor преведувач"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1196,6 +1191,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "Onion Услуги"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Услуги кои се достапни само ако користите Tor"
@@ -1254,8 +1254,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Како да и пристапите на onion услугата"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1281,8 +1281,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Решавање проблеми"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2140,6 +2140,11 @@ msgstr ""
 "излистан таму."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "Познати проблеми"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2235,6 +2240,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "Деинсталирање"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Како да го отстаните Tor Browser од вашиот систем"
@@ -2282,204 +2292,71 @@ msgstr ""
 "Забележете дека вашата стандардна \"Деинсталирај\" алатка во вашиот "
 "оперативен систем не е користена."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "Станете Tor преведувач"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Станете преведувач за Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### Најавување на Transifex"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Внесете ги вашите информации во полињата и кликнете на копчето \"Најави "
-"се\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Пополнете ја следната страна со вашето име и изберете \"Локализација\" и "
-"\"Преведувач\" од паѓачките менија:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* На следната страна, изберете \"Придружи се на постоечки прект\" и "
-"продолжете."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* На следната страна, изберете јазици кои ги зборувате од паѓачкото мени и "
-"продолжете."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-"* Кликнете на плавото копче \"Придружете му се на тимот\" на крајната десна "
-"страна:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Изберете го јазикот на кој сакате да преведувате од паѓачкото мени:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Ќе ви се појави известување горе на веб страната како ова:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Превземи Tor Прелистувач"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Нашата мисија:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Донирај"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Донирај сега"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Регистрирај се"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Логото на Tor"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Донирај"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "ДОНИРАЈТЕ СЕГА"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Превземи Tor Прелистувач"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Пребарај"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Теми"
diff --git a/contents+ms.po b/contents+ms.po
index bf178b833..f8272b149 100644
--- a/contents+ms.po
+++ b/contents+ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: abuyop <abuyop at gmail.com>, 2019\n"
 "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -52,16 +52,6 @@ msgstr "Hubungan"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Pemalam"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Mahu menjadi penterjemah Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Perihal Pelayar Tor"
 
@@ -97,8 +87,6 @@ msgstr "Mengurus identiti"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Perkhidmatan Onion"
 
@@ -119,24 +107,31 @@ msgstr "Mengemaskini"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Pemalam"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Pencarisilapan"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Menyahpasang"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Masalah-masalah diketahui"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Mahu menjadi Penterjemah Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1236,6 +1231,11 @@ msgstr ""
 "menu maklumat laman, iaitu dalam palang URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Perkhidmatan yang boleh dicapai menggunakan Tor"
@@ -1294,8 +1294,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Bagaimana hendak mencapai perkhidmatan onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1327,8 +1327,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Pencarisilapan"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2186,6 +2186,11 @@ msgstr ""
 "masalah yang anda hadapi sudah tercatat dalam senarai tersebut."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2284,6 +2289,11 @@ msgstr ""
 "Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Bagaimana hendak membuang Pelayar Tor daripada sistem anda"
@@ -2331,232 +2341,81 @@ msgstr ""
 "Perhatian Utiliti 'Uninstall\" piawai sistem pengoperasian anda tidak "
 "digunakan."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Mahu menjadi penterjemah untuk Projek Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Jika anda berminat untuk membantu projek dengan menterjemah panduan atau "
-"Pelayar Tor ke dalam bahasa anda. Bantuan anda sangat dihargai! Lokalisasi "
-"Projek Tor dihos dalam Hab [Localization "
-"Lab](https://www.localizationlab.org) di Transifex, iaitu alat penterjemahan"
-" pihak-ketiga. Anda perlu mendaftar dengan Transifex untuk memulakan kerja-"
-"kerja penterjemahan. Panduan di bawah merupakan langkah-langkah mendaftar "
-"baharu akaun Transifex dan memulakan kerja-kerja penterjemahan."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Sebelum melakukan kerja-kerja penterjemahan, sila rujuk halaman Projek Tor "
-"di [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"Di halaman ini anda temui garis panduan dan sumber-sumber yang dapat "
-"melancarkan lagi sumbangan anda dalam bentuk terjemahan Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Pergi ke [halaman pendaftaran baharu "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Masukkan maklumat anda ke dalam medan yang diperlukan kemudian klik butang "
-"'Sign Up':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Isi halaman berikutnya dengan nama anda dan pilih \"Localization\" dan "
-"\"Translator\" melalui menu tarik-turun:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Pada halaman berikutnya, pilih 'oin an existing project' dan klik "
-"teruskan."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Pada halaman berikutnya, pilih bahasa pertuturan anda melalui menu tarik-"
-"turun dan klik teruskan."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Anda kini sudah mendaftar! Terus pergi ke  [halaman Transifex "
-"Tor](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Klik butang biru 'Join Team' di hujung kanan halaman:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Pilih bahasa yang mahu diterjemahkan menerusi menu tarik-turun:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Satu pemberitahuan akan timbul di bahagian teratas halaman seperti:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Setelah keahlian anda diluluskan anda boleh memulakan penterjemahan; "
-"terdapat satu senarai yang perlu diterjemahkan pada [halaman Transifex "
-"Tor](https://www.transifex.com/otf/torproject/) sekiaranya anda sedia "
-"memulakan kerja-kerja menterjemah."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Muat Turun Pelayar Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Wiki Localization Lab](https://wiki.localizationlab.org/index.php/Tor) juga"
-" mempunyai maklumat berkenaan terjemahan yang berdasarkan keutamaan "
-"tertinggi."
+"Muat turun Pelayar Tor untuk menikmati pelayaran secara persendirian tanpa "
+"dijejak, diintip, atau ditapis."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Terima kasih atas minat anda mahu membantu projek ini!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Misi kami:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"Untuk melindungi hak asasi manusia dan kebebasan dengan mencipta dan "
+"Untuk melindungi hak-hak kemanusian dan kebebasan dengan mencipta dan "
 "menghasilkan teknologi keawanamaan dan kerahsiaan bebas dan bersumber-"
 "terbuka, menyokong ketersediaan dan penggunaan tanpa-had, dan melanjutkan "
 "kesefahaman saintifik dan popular mereka."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Derma"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Dermalah Sekarang"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Langgani Surat Berita kami"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 "Dapatkan kemaskini bulanan dan peluang-peluang yang ditawarkan melalui "
-"Projek Tor"
+"Projek Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Daftar baharu"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Tanda dagangan, notis hak cipta, dan peraturan untuk kegunaan pihak ketiga "
-"boleh ditemui dalam"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Projek Tor | Panduan Pelayar Tor"
+"boleh ditemui dalam %(link_to_faq)s kami"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Derma"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Muat Turun Pelayar Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Gelintar"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Projek Tor | Panduan Pelayar Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Topik-Topik"
diff --git a/contents+nb-NO.po b/contents+nb-NO.po
index 75e501f2f..07652bf4e 100644
--- a/contents+nb-NO.po
+++ b/contents+nb-NO.po
@@ -1,16 +1,17 @@
 # Translators:
 # Allan Nordhøy <epost at anotheragency.no>, 2018
-# erinm, 2019
-# john martinsen <rsa at tutanota.de>, 2019
 # Jørgen Moen Isaksen <klokkefriken2 at protonmail.com>, 2019
+# erinm, 2019
+# a356f726dcd9c475642ac26af10009cc, 2019
+# 490cdfb601cecc09e36402222ad5913c, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Jørgen Moen Isaksen <klokkefriken2 at protonmail.com>, 2019\n"
+"Last-Translator: 490cdfb601cecc09e36402222ad5913c, 2019\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/otf/teams/1519/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +55,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Programtillegg"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Bli en Tor overstter"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Om Tor-nettleseren"
 
@@ -99,8 +90,6 @@ msgstr "Behandling av identiteter"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -121,24 +110,31 @@ msgstr "Oppdatering"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Programtillegg"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Feilsøking"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Avinstallering"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Kjente problemer"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Bli en Tor Oversetter"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1084,6 +1080,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Tjenester som bare kan nås ved bruk av Tor"
@@ -1132,7 +1133,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1155,7 +1156,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1950,6 +1951,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2030,6 +2036,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Hvordan fjerne Tor-nettleseren fra ditt system"
@@ -2077,192 +2088,71 @@ msgstr ""
 "Merk at det vanlige verktøyet i ditt operativsystem \"Avinstaller\" ikke "
 "blir brukt."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Bli oversetter for Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Doner"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donér Nå"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Abonner på vårt Nyhetsbrev"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Få månedlige oppdateringer og muligheter fra Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Meld deg på"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
+"Varemerke, merknader om opphavsrett, og regler for bruk av tredjepart finner"
+" du i vårt %(link_to_faq)s"
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Doner"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Meny"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+nl.po b/contents+nl.po
index 7fa4fae6a..42a4da1a5 100644
--- a/contents+nl.po
+++ b/contents+nl.po
@@ -1,16 +1,17 @@
 # Translators:
+# Full name, 2019
+# erinm, 2019
+# Tonnes <tonnes.mb at gmail.com>, 2019
 # bacovane <bart-ts at tushmail.com>, 2019
 # Emma Peel, 2019
-# Meteor0id, 2019
-# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,16 +55,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plug-ins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Over Tor Browser"
 
@@ -99,8 +90,6 @@ msgstr "Beheren van identiteiten"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Diensten"
 
@@ -121,24 +110,31 @@ msgstr "Bijwerken"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Probleem oplossen"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "De-installeren"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Bekende problemen"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Een Tor Vertaler worden"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1103,6 +1099,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Services die alleen toegankelijk zijn via Tor"
@@ -1151,7 +1152,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1174,7 +1175,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1976,6 +1977,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2056,6 +2062,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Hoe verwijder je de Tor Browser van je systeem"
@@ -2103,192 +2114,69 @@ msgstr ""
 "Let erop dat de standaard \"de-installeer\" tool van je operating system "
 "niet wordt gebruikt."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Een vertaler worden voor het Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Vul jouw informatie in in de velden en klik op de 'Registreer' knop."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Doneer"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Nu doneren"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Aanmelden"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Doneer"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+nn.po b/contents+nn.po
new file mode 100644
index 000000000..c23002554
--- /dev/null
+++ b/contents+nn.po
@@ -0,0 +1,2005 @@
+# Translators:
+# erinm, 2019
+# Bjørn I., 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+0000\n"
+"Last-Translator: Bjørn I., 2019\n"
+"Language-Team: Norwegian Nynorsk (https://www.transifex.com/otf/teams/1519/nn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Brukarmanual for Tor Browser"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About"
+msgstr "Um"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Press"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Blog"
+msgstr "Blogg"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Newsletter"
+msgstr "Nyheitsbrev"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Contact"
+msgstr "Kontakt"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About Tor Browser"
+msgstr "Om Tor Browser"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "Lastar ned"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "Bruer"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr "Handsam identitetar"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr "Trygge tilkoplingar"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr "Security Settings"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr "Oppdaterer"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr "Feilsøking"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr "Avinstallerar"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "Kjende problem"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.title)
+msgid "ABOUT TOR BROWSER"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr ""
+"Les om kva Tor-nettlesaren kan gjere for å ta vare på personvernet og "
+"anonymiteten din"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"* Your internet service provider, and anyone watching your connection "
+"locally, will not be able to track your internet activity, including the "
+"names and addresses of the websites you visit."
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"* The operators of the websites and services that you use, and anyone "
+"watching them, will see a connection coming from the Tor network instead of "
+"your real Internet (IP) address, and will not know who you are unless you "
+"explicitly identify yourself."
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"In addition, Tor Browser is designed to prevent websites from "
+"“fingerprinting” or identifying you based on your browser configuration."
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"By default, Tor Browser does not keep any browsing history. Cookies are only"
+" valid for a single session (until Tor Browser is exited or a <a href"
+"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid "##### HOW TOR WORKS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"Tor is a network of virtual tunnels that allows you to improve your privacy "
+"and security on the Internet. Tor works by sending your traffic through "
+"three random servers (also known as *relays*) in the Tor network. The last "
+"relay in the circuit (the “exit relay”) then sends the traffic out onto the "
+"public Internet."
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"../static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"The image above illustrates a user browsing to different websites over Tor. "
+"The green middle computers represent relays in the Tor network, while the "
+"three keys represent the layers of encryption between the user and each "
+"relay."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.title)
+msgid "DOWNLOADING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.description)
+msgid "How to download Tor Browser"
+msgstr "Korleis laste ned Tor Browser"
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"The safest and simplest way to download Tor Browser is from the official Tor"
+" Project website at https://www.torproject.org/download."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"Your connection to the site will be secured using [HTTPS](/secure-"
+"connections), which makes it much harder for somebody to tamper with."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"However, there may be times when you cannot access the Tor Project website: "
+"for example, it could be blocked on your network."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"If this happens, you can use one of the alternative download methods listed "
+"below."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid "##### MIRRORS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"If you're unable to download Tor Browser from the official Tor Project "
+"website, you can instead try downloading it from one of our official "
+"mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid "##### GETTOR"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"GetTor is a service that automatically responds to messages with links to "
+"the latest version of Tor Browser, hosted at a variety of locations, such as"
+" Dropbox, Google Drive and GitHub."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid "###### TO USE GETTOR VIA EMAIL:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"Send an email to gettor at torproject.org, and in the body of the message "
+"simply write “windows”, “osx”, or “linux”, (without quotation marks) "
+"depending on your operating system."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"GetTor will respond with an email containing links from which you can "
+"download the Tor Browser package, the cryptographic signature (needed for "
+"verifying the download), the fingerprint of the key used to make the "
+"signature, and the package’s checksum. You may be offered a choice of "
+"“32-bit” or “64-bit” software: this depends on the model of the computer you"
+" are using."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid "###### TO USE GETTOR VIA TWITTER:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"To get links for downloading Tor Browser in English for macOS, send a Direct"
+" Message to @get_tor with the words \"osx en\" in it (you don't need to "
+"follow the account)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid "###### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
+msgstr ""
+
+#: https//tb-manual.torproject.org/downloading/
+#: (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"To get links for downloading Tor Browser in Chinese for Linux, send a "
+"message to gettor at torproject.org with the words \"linux zh\" in it."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.title)
+msgid "RUNNING TOR BROWSER FOR THE FIRST TIME"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.description)
+msgid "Learn how to use Tor Browser for the first time"
+msgstr "Lær korleis du brukar Tor Browser for fyrste gong"
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"When you run Tor Browser for the first time, you will see the Tor Network "
+"Settings window. This offers you the option to connect directly to the Tor "
+"network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "##### CONNECT"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/connect.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"In most cases, choosing \"Connect\" will allow you to connect to the Tor "
+"network without any further configuration. Once clicked, a status bar will "
+"appear, showing Tor’s connection progress. If you are on a relatively fast "
+"connection, but this bar seems to get stuck at a certain point, see the <a "
+"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
+"problem."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "##### CONFIGURE"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/configure.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"If you know that your connection is censored, or uses a proxy, you should "
+"select this option. Tor Browser will take you through a series of "
+"configuration options."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"The first screen asks if access to the Tor network is blocked or censored on"
+" your connection. If you do not believe this is the case, select “No”. If "
+"you know your connection is censored, or you have tried and failed to "
+"connect to the Tor network and no other solutions have worked, select “Yes”."
+" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
+"screen to configure a pluggable transport."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"The next screen asks if your connection uses a proxy. In most cases, this is"
+" not necessary. You will usually know if you need to answer “Yes”, as the "
+"same settings will be used for other browsers on your system. If possible, "
+"ask your network administrator for guidance. If your connection does not use"
+" a proxy, click “Continue”."
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.title)
+msgid "BRIDGES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.description)
+msgid ""
+"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
+"“bridge” relays."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
+"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
+" are run by volunteers; unlike ordinary relays, however, they are not listed"
+" publicly, so an adversary cannot identify them easily. Using bridges in "
+"combination with pluggable transports helps to disguise the fact that you "
+"are using Tor."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Other pluggable transports, like meek, use different anti-censorship "
+"techniques that do not rely on bridges. You do not need to obtain bridge "
+"addresses in order to use these transports."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid "##### GETTING BRIDGE ADDRESSES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Because bridge addresses are not public, you will need to request them "
+"yourself. You have two options:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"* Visit https://bridges.torproject.org/ and follow the instructions, or"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"* Email bridges at torproject.org from a Gmail, Yahoo, or Riseup email address"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid "##### ENTERING BRIDGE ADDRESSES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Once you have obtained some bridge addresses, you will need to enter them "
+"into Tor Launcher."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"If you're starting Tor Browser for the first time, click 'Configure' to open"
+" the Tor Network Settings window. Otherwise, click the Torbutton to the left"
+" of the URL bar, then select 'Tor Network Settings...' to access these "
+"options."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"In the Tor Network Settings window, select 'Tor is censored in my country.' "
+"Then, select 'Provide a bridge I know' and enter each bridge address on a "
+"separate line."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"col-md-6\" src=\"../../static/images/tor-launcher-custom-"
+"bridges.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Click “OK” to save your settings. Using bridges may slow down the connection"
+" compared to using ordinary Tor relays."
+msgstr ""
+
+#: https//tb-manual.torproject.org/bridges/
+#: (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"If the connection fails, the bridges you received may be down. Please use "
+"one of the above methods to obtain more bridge addresses, and try again."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.title)
+msgid "PLUGGABLE TRANSPORTS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.description)
+msgid ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out. This can be useful in situations where an Internet Service "
+"Provider or other authority is actively blocking connections to the Tor "
+"network."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "##### TYPES OF PLUGGABLE TRANSPORT"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Currently there are five pluggable transports available, but more are being "
+"developed."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "<table class=\"table table-striped\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "<tbody>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "<tr class=\"odd\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "<td>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "obfs3"
+msgstr "obfs3"
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "</td>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
+"any other protocol. While still included by default, it is reccomended to "
+"use obfs4 instead, as it has several security improvements over obfs3."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "</tr>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "<tr class=\"even\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "obfs4"
+msgstr "obfs4"
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "FTE"
+msgstr "FTE"
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
+"(HTTP) traffic."
+msgstr ""
+"FTE (formatomformingskryptering) forkler Tor traffic som vanleg nett- (HTTP)"
+" trafikk."
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "meek"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"meek transports all make it look like you are browsing a major web site "
+"instead of using Tor. meek-amazon makes it look like you are using Amazon "
+"Web Services; meek-azure makes it look like you are using a Microsoft web "
+"site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "Snowflake"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Snowflake is an improvement upon Flashproxy. It sends your traffic through "
+"WebRTC, a peer-to-peer protocol with built-in NAT punching."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "</tbody>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "</table>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "##### USING PLUGGABLE TRANSPORTS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"To use a pluggable transport, first click the onion icon to the left of the "
+"URL bar, or click 'Configure' when starting Tor Browser for the first time."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid "Next, select 'Tor Network Settings' from the drop-down menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"In the window that appears, check 'Tor is censored in my country,' then "
+"click 'Select a built-in bridge.'"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"From the drop-down menu, select whichever pluggable transport you'd like to "
+"use."
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"col-md-6\" "
+"src=\"../../static/images/pluggable_transport_network_settings.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/transports/
+#: (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Once you've selected the pluggable transport you'd like to use, click 'OK' "
+"to save your settings."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.title)
+msgid "CIRCUMVENTION"
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.description)
+msgid "What to do if the Tor network is blocked"
+msgstr "Kva skal ein gjere når Tor-nettverket er blokkert"
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Direct access to the Tor network may sometimes be blocked by your Internet "
+"Service Provider or by a government. Tor Browser includes some circumvention"
+" tools for getting around these blocks. These tools are called “pluggable "
+"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
+"page for more information on the types of transport that are currently "
+"available."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser currently has four pluggable transport options to choose from."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"To use pluggable transports, click 'Configure' in the Tor Launcher window "
+"that appears when you first run Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"You can also configure pluggable transports while Tor Browser is running by "
+"clicking on the onion icon to the left of the address bar, then selecting "
+"'Tor Network Settings'."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Select 'Tor is censored in my country,' then click 'Select a built-in "
+"bridge.' Click on the drop-down menu and select the pluggable transport "
+"you'd like to use."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/bridges.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "Click 'OK' to save your settings."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "##### WHICH TRANSPORT SHOULD I USE?"
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Each of the transports listed in Tor Launcher’s menu works in a different "
+"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
+"Transports</a> page), and their effectiveness depends on your individual "
+"circumstances."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"If you are trying to circumvent a blocked connection for the first time, you"
+" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+msgstr ""
+
+#: https//tb-manual.torproject.org/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"If you try all of these options, and none of them gets you online, you will "
+"need to enter bridge addresses manually. Read the <a href=\"/en-"
+"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
+"obtain them."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.title)
+msgid "MANAGING IDENTITIES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.description)
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"When you connect to a website, it is not only the operators of that website "
+"who can record information about your visit. Most websites now use numerous "
+"third-party services, including social networking “Like” buttons, analytics "
+"trackers, and advertising beacons, all of which can link your activity "
+"across different sites."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"Using the Tor network stops observers from being able to discover your exact"
+" location and IP address, but even without this information they might be "
+"able to link different areas of your activity together. For this reason, Tor"
+" Browser includes some additional features that help you control what "
+"information can be tied to your identity."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### THE URL BAR"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser centers your web experience around your relationship with the "
+"website in the URL bar. Even if you connect to two different sites that use "
+"the same third-party tracking service, Tor Browser will force the content to"
+" be served over two different Tor circuits, so the tracker will not know "
+"that both connections originate from your browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"On the other hand, all connections to a single website address will be made "
+"over the same Tor circuit, meaning you can browse different pages of a "
+"single website in separate tabs or windows, without any loss of "
+"functionality."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/circuit_full.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"You can see a diagram of the circuit that Tor Browser is using for the "
+"current tab in the site information menu, in the URL bar."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"In the circuit, the Guard or entry node is the first node and it's "
+"automatically and randomly selected by Tor. But it is different from the "
+"other nodes in the circuit. In order to avoid profiling attacks, the Guard "
+"node changes only after 2-3 months, unlike the other nodes, which change "
+"with every new domain. For more information about Guards, consult the <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### LOGGING IN OVER TOR"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"Although Tor Browser is designed to enable total user anonymity on the web, "
+"there may be situations in which it makes sense to use Tor with websites "
+"that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"If you log into a website using a regular browser, you also reveal your IP "
+"address and geographical location in the process. The same is often true "
+"when you send an email. Logging into your social networking or email "
+"accounts using Tor Browser allows you to choose exactly which information "
+"you reveal to the websites you browse. Logging in using Tor Browser is also "
+"useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"When you log in to a website over Tor, there are several points you should "
+"bear in mind:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
+"important information on how to secure your connection when logging in."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"* Tor Browser often makes your connection appear as though it is coming from"
+" an entirely different part of the world. Some websites, such as banks or "
+"email providers, might interpret this as a sign that your account has been "
+"hacked or compromised, and lock you out. The only way to resolve this is by "
+"following the site’s recommended procedure for account recovery, or "
+"contacting the operators and explaining the situation."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### CHANGING IDENTITIES AND CIRCUITS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/new_identity.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser features “New Identity” and “New Tor Circuit for this Site” "
+"options, located in the main menu (hamburger menu)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "###### NEW IDENTITY"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"This option is useful if you want to prevent your subsequent browser "
+"activity from being linkable to what you were doing before. Selecting it "
+"will close all your open tabs and windows, clear all private information "
+"such as cookies and browsing history, and use new Tor circuits for all "
+"connections. Tor Browser will warn you that all activity and downloads will "
+"be stopped, so take this into account before clicking “New Identity”."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "###### NEW TOR CIRCUIT FOR THIS SITE"
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
+"relay</a> you are using is unable to connect to the website you require, or "
+"is not loading it properly. Selecting it will cause the currently-active tab"
+" or window to be reloaded over a new Tor circuit. Other open tabs and "
+"windows from the same website will use the new circuit as well once they are"
+" reloaded. This option does not clear any private information or unlink your"
+" activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: https//tb-manual.torproject.org/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"You can also access this option in the new circuit display, in the site "
+"information menu, in the URL bar."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.description)
+msgid "Services that are only accessible using Tor"
+msgstr "Tenester som berre er tilgjengelege med Tor"
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"Onion services (formerly known as “hidden services”) are services (like "
+"websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"Onion services offer several advantages over ordinary services on the non-"
+"private web:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"* An onion services’s location and IP address are hidden, making it "
+"difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"* All traffic between Tor users and onion services is end-to-end encrypted, "
+"so you do not need to worry about <a href=\"/secure-connections\">connecting"
+" over HTTPS</a>."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"* The address of an onion service is automatically generated, so the "
+"operators do not need to purchase a domain name; the .onion URL also helps "
+"Tor ensure that it is connecting to the right location and that the "
+"connection is not being tampered with."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"Just like any other website, you will need to know the address of an onion "
+"service in order to connect to it. An onion address is a string of 16 (and "
+"in V3 format, 56) mostly random letters and numbers, followed by “.onion”."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"When accessing a website that uses an onion service, Tor Browser will show "
+"at the URL bar an icon of a little green onion displaying the state of your "
+"connection: secure and using an onion service. And if you're accessing a "
+"website with https and onion service, it will show an icon of a green onion "
+"and a padlock."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid "##### TROUBLESHOOTING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"If you cannot reach the onion service you require, make sure that you have "
+"entered the onion address correctly: even a small mistake will stop Tor "
+"Browser from being able to reach the site."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"If you are still unable to connect to the onion service, please try again "
+"later. There may be a temporary connection issue, or the site operators may "
+"have allowed it to go offline without warning."
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"You can also ensure that you're able to access other onion services by "
+"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
+"Service</a>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.title)
+msgid "SECURE CONNECTIONS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.description)
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr "Les om korleis du beskyttar dataa dine med Tor Browser og HTTPS"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"If personal information such as a login password travels unencrypted over "
+"the Internet, it can very easily be intercepted by an eavesdropper. If you "
+"are logging into any website, you should make sure that the site offers "
+"HTTPS encryption, which protects against this kind of eavesdropping. You can"
+" verify this in the URL bar: if your connection is encrypted, the address "
+"will begin with “https://”, rather than “http://”."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/https.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"The following visualization shows what information is visible to "
+"eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "<img class=\"\" src=\"../../static/images/tor-and-https.svg\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* Click the “Tor” button to see what data is visible to observers when "
+"you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* Click the “HTTPS” button to see what data is visible to observers when "
+"you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* When both buttons are green, you see the data that is visible to observers"
+" when you are using both tools."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* When both buttons are grey, you see the data that is visible to observers "
+"when you don't use either tool."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "##### POTENTIALLY VISIBLE DATA"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "<dl>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "<dt>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Site.com"
+msgstr "Site.com"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "</dt>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "<dd>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "The site being visited."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "</dd>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "user / pw"
+msgstr "brukar/pw"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "data"
+msgstr "data"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Data being transmitted."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "location"
+msgstr "plassering"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"Network location of the computer used to visit the website (the public IP "
+"address)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Tor"
+msgstr "Tor"
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: https//tb-manual.torproject.org/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "</dl>"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.title)
+msgid "Security Slider"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.description)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.description)
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser includes a “Security Slider” that lets you increase your "
+"security by disabling certain web features that can be used to attack your "
+"security and anonymity. Increasing Tor Browser’s security level will stop "
+"some web pages from functioning properly, so you should weigh your security "
+"needs against the degree of usability you require."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "##### Accessing the Security Slider"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/slider.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"The Security Slider is located in Torbutton’s “Security Settings” menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "##### Security Levels"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/slider_window.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"Increasing the level of the Security Slider will disable or partially "
+"disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "Safest"
+msgstr "Tryggast"
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"At this level, HTML5 video and audio media become click-to-play via "
+"NoScript; all JavaScript performance optimizations are disabled; some "
+"mathematical equations may not display properly; some font rendering "
+"features are disabled; some types of image are disabled; Javascript is "
+"disabled by default on all sites; most video and audio formats are disabled;"
+" and some fonts and icons may not display correctly."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "Safer"
+msgstr "Tryggare"
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"At this level, HTML5 video and audio media become click-to-play via "
+"NoScript; all JavaScript performance optimizations are disabled; some "
+"mathematical equations may not display properly; some font rendering "
+"features are disabled; some types of image are disabled; and JavaScript is "
+"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
+"sites."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "Standard"
+msgstr "Standard"
+
+#: https//tb-manual.torproject.org/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"At this level, all browser features are enabled. This is the most usable "
+"option."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.title)
+msgid "SECURITY SETTINGS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"By default, Tor Browser protects your security by encrypting your browsing "
+"data."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"You can further increase your security by choosing to disable certain web "
+"features that can be used to attack your security and anonymity."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"You can do this by increasing Tor Browser's Security Settings in the shield "
+"menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"Increasing Tor Browser's security level will stop some web pages from "
+"functioning properly, so you should weigh your security needs against the "
+"degree of usability you require."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "##### ACCESSING THE SECURITY SETTINGS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"The Security Settings can be accessed by clicking the Shield icon next to "
+"the Tor Browser URL bar."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"To view and adjust your Security Settings, click the 'Advanced Security "
+"Settings...' button in the shield menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-"
+"anim.gif\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "##### SECURITY LEVELS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"Increasing the Security Level in the Tor Browser Security Settings will "
+"disable or partially disable certain browser features to protect against "
+"possible attacks."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"You can enable these settings again at any time by adjusting your Security "
+"Level."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"col-lg-6\" src=\"../../static/images/security-settings-"
+"safest.png\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "At this level, all Tor Browser and website features are enabled."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "This level disables website features that are often dangerous."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "This may cause some sites to lose functionality."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
+"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
+"media) are click-to-play."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"This level only allows website features required for static sites and basic "
+"services."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid "These changes affect images, media, and scripts."
+msgstr ""
+
+#: https//tb-manual.torproject.org/security-settings/
+#: (content/security-settings/contents+en.lrtopic.body)
+msgid ""
+"Javascript is disabled by default on all sites; some fonts,icons, math "
+"symbols, and images are disabled; audio and video (HTML5 media) are click-"
+"to-play."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.title)
+msgid "UPDATING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.description)
+msgid "How to update Tor Browser"
+msgstr "Korleis oppdtarere Tor Browser"
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser must be kept updated at all times. If you continue to use an "
+"outdated version of the software, you may be vulnerable to serious security "
+"flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser will prompt you to update the software once a new version has "
+"been released: the Torbutton icon will display a yellow triangle, and you "
+"may see a written update indicator when Tor Browser opens. You can update "
+"either automatically or manually."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid "##### UPDATING TOR BROWSER AUTOMATICALLY"
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"400\" src=\"../../static/images/update1.png\" />"
+msgstr "<img width=\"400\" src=\"../../static/images/update1.png\" />"
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, click on the Torbutton icon, "
+"then select “Check for Tor Browser Update”."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"600\" src=\"../../static/images/update3.png\" />"
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When Tor Browser has finished checking for updates, click on the “Update” "
+"button."
+msgstr ""
+"Når Tor-nettlesaren er ferdig med å sjå etter oppdateringar, trykk på "
+"«Oppdater»-knappen."
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"600\" src=\"../../static/images/update4.png\" />"
+msgstr "<img width=\"600\" src=\"../../static/images/update4.png\" />"
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Wait for the update to download and install, then restart Tor Browser. You "
+"will now be running the latest version."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid "##### UPDATING TOR BROWSER MANUALLY"
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, finish the browsing session and"
+" close the program."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Remove Tor Browser from your system by deleting the folder that contains it "
+"(see the <a href='uninstalling'>Uninstalling</a> section for more "
+"information)."
+msgstr ""
+
+#: https//tb-manual.torproject.org/updating/
+#: (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Visit https://www.torproject.org/download/ and download a copy of the latest"
+" Tor Browser release, then install it as before."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.title)
+msgid "PLUGINS, ADD-ONS AND JAVASCRIPT"
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.description)
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid "##### FLASH PLAYER"
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Video websites, such as Vimeo make use of the Flash Player plugin to display"
+" video content. Unfortunately, this software operates independently of Tor "
+"Browser and cannot easily be made to obey Tor Browser’s proxy settings. It "
+"can therefore reveal your real location and IP address to the website "
+"operators, or to an outside observer. For this reason, Flash is disabled by "
+"default in Tor Browser, and enabling it is not recommended."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Some video websites (such as YouTube) offer alternative video delivery "
+"methods that do not use Flash. These methods may be compatible with Tor "
+"Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid "##### JAVASCRIPT"
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"JavaScript is a programming language that websites use to offer interactive "
+"elements such as video, animation, audio, and status timelines. "
+"Unfortunately, JavaScript can also enable attacks on the security of the "
+"browser, which might lead to deanonymization."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser includes an add-on called NoScript, accessible through the “S” "
+"icon at the top-right of the window. NoScript allows you to control the "
+"JavaScript (and other scripts) that runs on individual web pages, or block "
+"it entirely."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Users who require a high degree of security in their web browsing should set"
+" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
+"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
+"so for all websites). However, disabling JavaScript will prevent many "
+"websites from displaying correctly, so Tor Browser’s default setting is to "
+"allow all websites to run scripts in \"Standard\" mode."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid "##### BROWSER ADD-ONS"
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser is based on Firefox, and any browser add-ons or themes that are "
+"compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/plugins/
+#: (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"However, the only add-ons that have been tested for use with Tor Browser are"
+" those included by default. Installing any other browser add-ons may break "
+"functionality in Tor Browser or cause more serious problems that affect your"
+" privacy and security. It is strongly discouraged to install additional add-"
+"ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.title)
+msgid "TROUBLESHOOTING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.description)
+msgid "What to do if Tor Browser doesn’t work"
+msgstr "Kva skal ein gjere om Tor Browser ikkje fungerar"
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"You should be able to start browsing the web using Tor Browser shortly after"
+" running the program, and clicking the “Connect” button if you are using it "
+"for the first time."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### QUICK FIXES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"If Tor Browser doesn’t connect, there may be a simple solution. Try each of "
+"the following:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Your computer’s system clock must be set correctly, or Tor will not be "
+"able to connect."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Make sure another Tor Browser is not already running. If you’re not sure "
+"if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Make sure that any antivirus program you have installed is not preventing "
+"Tor from running. You may need to consult the documentation for your "
+"antivirus software if you do not know how to do this."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "* Temporarily disable your firewall."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Delete Tor Browser and install it again. If updating, do not just "
+"overwrite your previous Tor Browser files; ensure they are fully deleted "
+"beforehand."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### IS YOUR CONNECTION CENSORED?"
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"If you still can’t connect, your Internet Service Provider might be "
+"censoring connections to the Tor network. Read the <a "
+"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser is under constant development, and some issues are known about "
+"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
+"Issues</a> page to see if the problem you are experiencing is already listed"
+" there."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Tor needs your system clock (and your time zone) set to the correct time."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* The following firewall software have been known to interfere with Tor and "
+"may need to be temporarily disabled:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Webroot SecureAnywhere"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Kaspersky Internet Security 2012"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Sophos Antivirus for Mac"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Microsoft Security Essentials"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Videos that require Adobe Flash are unavailable. Flash is disabled for "
+"security reasons."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Tor can not use a bridge if a proxy is set."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to "
+"ensure that each software build is exactly reproducible."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* To run Tor Browser on Ubuntu, users need to execute a shell script. Open "
+"\"Files\" (Unity's explorer), open Preferences → Behavior Tab → Set \"Run "
+"executable text files when they are opened\" to \"Ask every time\", then "
+"click OK."
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Tor Browser can also be started from the command line by running the "
+"following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "./start-tor-browser.desktop"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
+"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.description)
+msgid "How to remove Tor Browser from your system"
+msgstr "Korleis fjerne Tor-nettlesaren frå systemet ditt"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser does not affect any of the existing software or settings on your"
+" computer. Uninstalling Tor Browser will not affect your system’s software "
+"or settings."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"1. Locate your Tor Browser folder. The default location on Windows is the "
+"Desktop; on macOS it is the Applications folder. On Linux, there is no "
+"default location, however the folder will be named \"tor-browser_en-US\" if "
+"you are running the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "2. Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "3. Empty your Trash"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard “Uninstall” utility is not used."
+msgstr ""
+
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Last ned Tor-nettlesaren"
+
+#: lego/templates/footer.html:10 templates/footer.html:10
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+
+#: lego/templates/footer.html:27 templates/footer.html:27
+msgid "Our mission:"
+msgstr "Vårt oppdrag:"
+
+#: lego/templates/footer.html:28 templates/footer.html:28
+msgid ""
+"To advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Gje ei pengegåve"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Doner no"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
+msgid "Subscribe to our Newsletter"
+msgstr "Abonner på nyheitsbrev"
+
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
+
+#: lego/templates/footer.html:56 templates/footer.html:56
+msgid "Sign up"
+msgstr "Registrer deg"
+
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our %(link_to_faq)s"
+msgstr ""
+
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr ""
+
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
+msgstr "Søk"
+
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
+#: templates/sidenav.html:4 templates/sidenav.html:35
+msgid "Topics"
+msgstr "Emne"
+
+#: templates/macros/topic.html:19
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/topic.html:21
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/topic.html:22
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/topic.html:23
+msgid "Permalink"
+msgstr ""
diff --git a/contents+pl.po b/contents+pl.po
index 6ba2f9d04..ba30340dd 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1,18 +1,18 @@
 # Translators:
-# Filip <filipiczesio at vp.pl>, 2018
-# Dawid Job <hoek at tuta.io>, 2019
-# erinm, 2019
-# Dawid Potocki <dpot at disroot.org>, 2019
+# Dawid Job <hoek at tuta.io>, 2018
 # Emma Peel, 2019
+# erinm, 2019
 # Waldemar Stoczkowski, 2019
+# Filip <filipiczesio at vp.pl>, 2019
+# Dawid Potocki <dpot at disroot.org>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2019\n"
+"Last-Translator: Dawid Potocki <dpot at disroot.org>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,16 +56,6 @@ msgstr "Kontakty"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Zostań tłumaczem Tor "
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "O Tor Browser"
 
@@ -101,8 +91,6 @@ msgstr "Zarządzanie tożsamościami"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Usługi Onion"
 
@@ -123,24 +111,31 @@ msgstr "Aktualizowanie"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Rozwiązywanie problemów"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Odinstalowanie"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Znane Problemy"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Zostań Tłumaczem Tor "
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1237,6 +1232,11 @@ msgstr ""
 "menu informacji o witrynie, w pasku URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "SERWISY CEBULOWE"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Usługi dostępne tylko za pomocą Tora"
@@ -1293,8 +1293,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Jak uzyskać dostęp do usług Tor"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1325,8 +1325,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Rozwiązywanie problemów"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2215,6 +2215,11 @@ msgstr ""
 "stronę <a href=\"/known-issues\">Znane Problemy</a>, aby sprawdzić, czy problem, którego doświadczasz, nie jest już tam wymieniony."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ZNANE PROBLEMY"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2313,6 +2318,11 @@ msgstr ""
 "Tora</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "ODINSTALOWANIE"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Jak usunąć Przeglądarkę Tora z Twojego systemu"
@@ -2364,226 +2374,79 @@ msgstr ""
 "Zwróć uwagę, że standardowe narzędzie \"Odinstaluj\" twojego systemu "
 "operacyjnego nie jest używane."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "STAWANIE SIĘ TŁUMACZEM TORA"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Stawanie się tłumaczem dla Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Jeśli jesteś zainteresowany pomocą projektowi poprzez tłumaczenie "
-"podręcznika lub Przeglądarki Tor na swój język, Twoja pomoc będzie bardzo "
-"mile widziana! Lokalizacja Tor Project znajduje się w [Localization "
-"Lab](https://www.localizationlab.org) Hub na Transifex, narzędziu do "
-"tłumaczenia. Aby zacząć wnosić swój wkład, musisz zarejestrować się w "
-"Transifex. Poniżej znajduje się zarys tego, jak się zarejestrować i "
-"rozpocząć."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Przed tłumaczeniem proszę przeczytaj stronę Tor Project na [Wiki "
-"Localization Lab](https://wiki.localizationlab.org/index.php/Tor). "
-"Znajdziesz tam wytyczne dotyczące tłumaczeń i zasoby, które pomogą Ci "
-"przyczynić się do tłumaczenia Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### REJESTRACJA W SYSTEMIE TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Przejdź na [Strona rejestracji Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Wprowadź swoje dane do pól i kliknij przycisk 'Zarejestruj się':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Wypełnij następną stronę ze swoim imieniem i wybierz \"Lokalizacja\" i "
-"\"Tłumacz\" z rozwijanego menu:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Na następnej stronie wybierz 'Dołącz do istniejącego projektu' i "
-"kontynuuj."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Na następnej stronie wybierz z rozwijanego menu języki, w których mówisz, "
-"i kontynuuj."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Jesteś teraz zarejestrowany/a! Przejdź do strony [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Kliknij niebieski przycisk 'Dołącz do Zespołu' po prawej stronie:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Wybierz język, który chcesz przetłumaczyć z menu rozwijanego:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Powiadomienie pojawi się teraz na górze strony w ten sposób:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Po zatwierdzeniu członkostwa możesz rozpocząć tłumaczenie; lista potrzebnych"
-" tłumaczeń znajduje się na [stronie Tor "
-"Transifex](https://www.transifex.com/otf/torproject/), gdy jesteś gotowy do "
-"rozpoczęcia."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Pobierz przeglądarkę Tor"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"również posiada informacje na temat tłumaczeń o większym priorytecie."
+"Pobierz przeglądarkę Tor Browser, aby doświadczyć prawdziwego prywatnego "
+"przeglądania bez śledzenia, nadzoru lub cenzury."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Dziękujemy za zainteresowanie w pomocy projektowi!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Nasza misja:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"rozwijanie praw i wolności człowieka poprzez tworzenie i wdrażanie wolnych i"
+"Rozwijanie praw i wolności człowieka poprzez tworzenie i wdrażanie wolnych i"
 " otwartych technologii anonimowości i prywatności, wspieranie ich "
 "nieograniczonej dostępności i wykorzystania oraz propagowanie ich naukowego "
 "i powszechnego zrozumienia."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Wspomóż finansowo"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Wesprzyj teraz"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Zapisz się do naszego newslettera"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Uzyskaj comiesięczne aktualizacje i możliwości od Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Uzyskaj comiesięczne aktualizacje i możliwości od Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Zarejestruj się"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Znak towarowy, informacje o prawach autorskich i zasady korzystania z nich "
-"przez osoby trzecie można znaleźć na naszej "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Instrukcja Obsługi Przeglądarki Tor"
+"przez osoby trzecie można znaleźć w naszym %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logo Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Wspomóż finansowo"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "ZRÓB DOTACJE"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Pobierz przeglądarkę Tor"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Szukaj"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Instrukcja Obsługi Przeglądarki Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Tematy"
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index db8dcec03..8f31b8feb 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -1,21 +1,20 @@
 # Translators:
 # drebs <drebs at riseup.net>, 2018
-# Alexei Gonçalves de Oliveira <alexis at gessicahellmann.com>, 2018
+# Chacal E., 2019
 # Communia <ameaneantie at riseup.net>, 2019
 # erinm, 2019
+# Emma Peel, 2019
 # Eduardo Addad de Oliveira <eduardoaddad at hotmail.com>, 2019
+# Alexei Gonçalves de Oliveira <alexis at gessicahellmann.com>, 2019
 # Cy Belle <cyb3ll3 at protonmail.com>, 2019
-# Eduardo Bonsi, 2019
-# Emma Peel, 2019
-# Chacal E., 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Cy Belle <cyb3ll3 at protonmail.com>, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,16 +58,6 @@ msgstr "Contato"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Tornando-se um tradutor Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Sobre o Navegador Tor"
 
@@ -104,8 +93,6 @@ msgstr "Como gerenciar identidades"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Serviços Onion"
 
@@ -126,24 +113,31 @@ msgstr "Atualizando"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Solução de Problemas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Desinstalando"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problemas conhecidos"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Tornando-se um tradutor Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1245,6 +1239,11 @@ msgstr ""
 " informações do site, na barra de URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "SERVIÇOS ONION"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Servicos acessíveis somente com o uso do Tor"
@@ -1303,8 +1302,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Como acessar um serviço onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### COMO ACESSAR UM SERVIÇO ONION"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1335,8 +1334,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Resolução de problemas"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### SOLUÇÃO DE PROBLEMAS"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2220,6 +2219,11 @@ msgstr ""
 "está encontrando já foi listado lá."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "PROBLEMAS CONHECIDOS"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2318,6 +2322,11 @@ msgstr ""
 " via Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "DESINSTALAÇÃO"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Como remover o Navegador Tor do seu sistema"
@@ -2369,231 +2378,79 @@ msgstr ""
 "Note que o serviço padrão de \"Desinstalação\"  do seu sistema operacional "
 "não é utilizado."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "TRANSFORMAR-SE EM UM TRADUTOR TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Tornando-se um tradutor para o Projeto Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Se você tiver interesse em ajudar o projeto traduzindo o manual do Navegador"
-" Tor ou o Navegador Tor para o seu idioma, sua ajuda será muito apreciada! A"
-" localização do Tor Project está hospedada no Hub [Localization "
-"Lab](https://www.localizationlab.org) no Transifex, uma ferramenta de "
-"tradução terceirizada. Para começar a contribuir, você terá que se inscrever"
-" no Transifex. Abaixo está um resumo de como se inscrever e começar a "
-"traduzir."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Antes de traduzir, leia a página do Projeto Tor no [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). Lá, você encontrará "
-"diretrizes de tradução e recursos que ajudarão você a contribuir com as "
-"traduções do Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### REGISTRAR NO TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Vá até a [página de inscrição do "
-"Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Insira suas informações nos campos em branco e clique no botão \"Inscrever-"
-"se\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Preencha a próxima página com o seu nome e selecione \"Localização\" e "
-"\"Tradutor\" nos menus de listagem:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Na próxima página, selecione 'Participar de um projeto existente' e "
-"continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Na próxima página, selecione os idiomas que você fala no menu suspenso e "
-"continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Agora você está inscrito! Vá para a página [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Clique no botão \"Junte-se a nós\" no canto direito."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Selecione o idioma que você gostaria de traduzir, no menu suspenso:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-"* Uma notificação será exibida na parte superior da página da seguinte "
-"maneira:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Depois que sua associação for aprovada, você poderá começar a traduzir; Há "
-"uma lista de traduções necessárias na página [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/) quando você estiver "
-"pronto para começar."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Baixe o Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"O [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"também possui informações sobre as traduções com maior prioridade."
+"Faça download do Navegador Tor para experimentar uma navegação realmente "
+"privada, sem rastreamento, vigilância ou censura."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Obrigado pelo seu interesse em ajudar o projeto!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Nossa missão:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 "Proteger os direitos humanos e liberdades por meio da criação e "
 "implementação de tecnologias de anonimato e privacidade livres e de código "
-"aberto, provendo apoio à seu uso e disponibilidade irrestritos enquanto "
-"contribuímos para avanço de sua compreensão científica e popular. "
+"aberto, provendo apoio a seu uso e disponibilidade irrestritos. Ao mesmo "
+"tempo, contribuímos para o avanço de sua compreensão científica e popular. "
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Doar"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Doe Agora"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Assine o nosso boletim de notícias"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Receba atualizações mensais e avisos de oportunidades do Projeto Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Receba atualizações mensais e oportunidades do Projeto Tor."
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registo"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"Trademark, avisos de direitos autorais, e regras de uso para terceiros podem"
-" ser encontradas em nosso"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manual do Navegador Tor"
+"Marca registrada, avisos de direitos autorais, e regras de uso para "
+"terceiros podem ser encontradas em nosso %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logotipo do Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Doar"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DOE AGORA"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Baixe o Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Pesquisa"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manual do Navegador Tor"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Tópicos"
diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index d22205610..faae207de 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -1,17 +1,18 @@
 # Translators:
 # erinm, 2019
 # Emma Peel, 2019
-# Manuela Silva <manuelarodsilva at gmail.com>, 2019
-# Rui <xymarior at yandex.com>, 2019
 # Hugo9191 <hugoncosta at gmail.com>, 2019
+# Rui <xymarior at yandex.com>, 2019
+# Manuela Silva <manuelarodsilva at gmail.com>, 2019
+# Nuno Rego <nuno.rego at outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Hugo9191 <hugoncosta at gmail.com>, 2019\n"
+"Last-Translator: Nuno Rego <nuno.rego at outlook.com>, 2019\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,16 +56,6 @@ msgstr "Contactar"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plug-ins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Traduzir o Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Sobre o Tor Browser"
 
@@ -100,8 +91,6 @@ msgstr "Gerir identidades"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Serviços Onion"
 
@@ -122,24 +111,31 @@ msgstr "Atualização"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Resolução de Problemas"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Desinstalação"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Problemas conhecidos"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Ser um tradutor para o Projeto Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1243,6 +1239,11 @@ msgstr ""
 "de informações do site, na barra de endereços."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "SERVIÇOS ONION"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Serviços que estão apenas acessíveis utilizando o Tor"
@@ -1300,8 +1301,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Como aceder a um serviço onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1332,8 +1333,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Resolução de problemas"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2219,6 +2220,11 @@ msgstr ""
 "que está a ter já foi reportado e é conhecido pelos programadores."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "PROBLEMAS CONHECIDOS"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2318,6 +2324,11 @@ msgstr ""
 "via Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "DESINSTALAÇÃO"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Como remover o Tor Browser do seu sistema"
@@ -2369,226 +2380,79 @@ msgstr ""
 "Note que  não é utilizada a funcionalidade padrão de \"Desinstalação\" do "
 "seu sistema operativo."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "SER UM TRADUTOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Ser um tradutor para o Projeto Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Se estiver interessado em ajudar o projeto traduzindo o manual ou o Tor "
-"Browser para o seu idioma, a sua ajuda será muito apreciada! A localização "
-"do Tor Project está alojada no Hub [Localization "
-"Lab](https://www.localizationlab.org) do Transifex, uma ferramenta na web de"
-" tradução por terceiros. Para começar a contribuir, terá que criar uma conta"
-" no Transifex (gratuita). Abaixo está um resumo de como se inscrever e "
-"começar."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Antes de traduzir, leia a página do Projeto Tor no [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor). Encontram-se aí "
-"diretrizes de tradução e recursos que o ajudarão nas traduções do Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### INICIAR SESSÃO NA TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Aceda à [página de registo do Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Insira a sua informação nos campos e clique no botão 'Criar conta':"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Preencha a página seguinte com o seu nome e selecione \"Localização\" e "
-"\"Tradutor\" nos campos de menus:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Na página seguinte, selecione 'Junte-se a um projeto existente' e "
-"continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Na página seguinte, selecione os idiomas que entende no campo de menu e "
-"continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Já terminou o seu registo! Aceda à [página do Tor no "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Clique no botão 'Aderir à equipa' no canto direito:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Selecione o idioma que gostaria de traduzir no campo:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-"* Aparecerá uma notificação na parte superior da página como o exemplo "
-"seguinte:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Quando for aprovado, poderá começar a traduzir. Basta aceder à [página do "
-"Tor no Transifex](https://www.transifex.com/otf/torproject/) quando estiver "
-"pronto para começar."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Transferir o Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"A [wiki do Localization Lab](https://wiki.localizationlab.org/index.php/Tor)"
-" também tem informações sobre as traduções com maior prioridade."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Obrigado pelo seu interesse em ajudar o projeto!"
+"Transfira o Tor Browser para experimentar uma navegação privada real sem "
+"monitorização, vigilância ou censura."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "A nossa missão:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"para o progresso nos direitos humanos e liberdades criando e implementando "
-"tecnologias livres e de código-aberto de anonimato e privacidade, apoiando a"
-" sua disponibilidade e utilização não restringida, e contribuindo para o "
+"Para o progresso nos direitos humanos e liberdades, criando e implementando "
+"tecnologias livres e de código-aberto com anonimato e privacidade, apoiando "
+"a sua disponibilidade e utilização não restringida, e contribuindo para o "
 "avanço da sua compreensão científica e popular. "
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Fazer donativo"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Doar Agora"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Subscreva o nosso Boletim Informativo"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Receba atualizações mensais e oportunidades do Projeto Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Receba atualizações mensais e oportunidades do projeto Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registo"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "As marcas comerciais, avisos de direitos de autor e regras de utilização por"
-" parte de terceiros podem ser encontradas em"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manual do Tor Browser"
-
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Logótipo do Tor"
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Fazer donativo"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DOE AGORA"
+" parte de terceiros podem ser encontradas em %(link_to_faq)s"
 
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Transferir o Tor Browser"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Pesquisar"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manual do Tor Browser"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Tópicos"
diff --git a/contents+ro.po b/contents+ro.po
index 81816abc1..1fe1b5994 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -1,17 +1,17 @@
 # Translators:
 # Vlad Stoica <vlad at vlads.me>, 2018
 # erinm, 2019
-# A C <ana at shiftout.net>, 2019
-# Emma Peel, 2019
 # eduard pintilie <eduard.pintilie at gmail.com>, 2019
+# Emma Peel, 2019
+# A C <ana at shiftout.net>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: eduard pintilie <eduard.pintilie at gmail.com>, 2019\n"
+"Last-Translator: A C <ana at shiftout.net>, 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,16 +55,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Cum să devii un traducător Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Despre Tor Browser"
 
@@ -100,8 +90,6 @@ msgstr "Administrarea identităților"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Servicii Onion"
 
@@ -122,24 +110,31 @@ msgstr "Actualizez"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Depanare"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Dezinstalare"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Probleme cunoscute"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Cum puteți deveni un Translator Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1252,6 +1247,11 @@ msgstr ""
 "Informații al site-ului, în bara de adrese URL."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Servicii care sunt accesibile doar folosind Tor"
@@ -1309,8 +1309,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Cum se poate accesa un serviciu Onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1341,8 +1341,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Depanare"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2231,6 +2231,11 @@ msgstr ""
 "care o întâmpinați este deja afișată acolo."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2328,6 +2333,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">anonim în Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Cum să elimini Tor Browser din sistemul tău"
@@ -2379,230 +2389,79 @@ msgstr ""
 "Rețineți că nu este utilizat utilitarul standard \"Uninstall\" al sistemului"
 " de operare."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Cum puteți deveni traducător pentru proiectul Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Dacă sunteți interesat să ajutați proiectul prin traducerea manualului sau a"
-" browserului Tor în limba dvs., ajutorul dvs. ar fi foarte apreciat! "
-"Localizarea proiectului Tor este găzduită în Hub [Localization "
-"Lab](https://www.localizationlab.org) Hub pe Transifex, un instrument de "
-"traducere al terților. Pentru a începe să contribuiți, va trebui să vă "
-"înscrieți în Transifex. Mai jos este o schiță despre cum să vă înscrieți și "
-"să începeți."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Înainte de traducere, vă rugăm să citiți pagina Tor Project din "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"Acolo veți găsi linii directoare de traducere și resurse care vă vor ajuta "
-"să contribuiți la traducerea Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Mergeți la [pagina de înscriere Transifex](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Introduceți informațiile dvs. în câmpuri și faceți clic pe butonul \"Sign Up"
-" / Înscriere\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Completați următoarea pagină cu numele dvs. și selectați \"Localization\" "
-"și \"Translator\" din meniurile derulante:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* În pagina următoare, selectați \"Join an existing project / Alăturați-vă "
-"unui proiect existent\" și continuați."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* În pagina următoare, selectați din meniul derulant limbile pe care le "
-"vorbiți și continuați."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Acum sunteți înscris! Accesați [pagina Tor "
-"Transifex](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-"* Faceți clic pe butonul albastru \"Join Team / Alăturați-vă echipei\" de pe"
-" extrema dreaptă:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Selectați limba pe care doriți să o traduceți din meniul derulant:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Acum se va afișa o notificare în partea de sus a paginii:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"După aprobarea dvs. ca membru puteți începe traducerea; există o listă cu "
-"traducerile necesare la [pagina Tor "
-"Transifex](https://www.transifex.com/otf/torproject/) atunci când sunteți "
-"gata să începeți."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Descărcare Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) are "
-"de asemenea informații despre traducerile care au o prioritate mai mare."
+"Descărcați Tor Browser pentru a vă bucura de navigarea privată reală fără "
+"urmărire, supraveghere sau cenzură."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Vă mulțumim pentru interesul acordat proiectului!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Misiunea noastră:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"de a promova drepturile și libertățile omului prin crearea și desfășurarea "
+"De a promova drepturile și libertățile omului prin crearea și desfășurarea "
 "tehnologiilor anonimatului și a tehnologiilor de confidențialitate gratuite "
 "și cu sursă deschisă, sprijinirea disponibilității și utilizării lor "
 "nerestricționate și promovarea înțelegerii lor științifice și populare."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donează"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donează Acum"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Abonați-vă la newsletter-ul nostru"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Obțineți actualizări lunare și oportunități din Proiectul Tor"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Obțineți actualizări lunare și oportunități din Proiectul Tor:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Înscriere"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Marca comercială, anunțurile privind drepturile de autor și regulile de "
-"utilizare de către terți pot fi găsite în site-ul nostru"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Manual Tor Browser"
+"utilizare de către terți pot fi găsite în site-ul nostru %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Sigla Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Meniu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donează"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Descărcare Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Căutare"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Manual Tor Browser"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Subiecte"
diff --git a/contents+ru.po b/contents+ru.po
index 163a7aeac..a54ae1526 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -1,23 +1,20 @@
 # Translators:
 # Evgeny Aleksandrov <5678lutya at gmail.com>, 2019
 # JZDLin, 2019
-# Andrey, 2019
 # Sergey Leschina <mail at putnik.tech>, 2019
 # erinm, 2019
-# solokot <solokot at gmail.com>, 2019
 # Valentine Bobrovsy <vbabrouski at outlook.com>, 2019
-# Legenden Rifk <rekytcsgo at gmail.com>, 2019
 # Emma Peel, 2019
 # Sergey Smirnov <cj75300 at gmail.com>, 2019
-# Иван Иванов <remove4kebab at protonmail.com>, 2019
+# Legenden Rifk <rekytcsgo at gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Иван Иванов <remove4kebab at protonmail.com>, 2019\n"
+"Last-Translator: Legenden Rifk <rekytcsgo at gmail.com>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,16 +58,6 @@ msgstr "Контакты"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Дополнения"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Стать переводчиком Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "О Tor Browser"
 
@@ -106,8 +93,6 @@ msgstr "Управление личностями"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion-сервисы"
 
@@ -128,24 +113,31 @@ msgstr "Обновление"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Дополнения"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Устранение неполадок"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Удаление программы"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Особенности Tor Browser"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Стать переводчиком Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1212,6 +1204,11 @@ msgstr ""
 "браузера."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "Onion сервисы"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Сервисы, доступные только через Tor"
@@ -1269,8 +1266,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Как получить доступ к onion-сервису"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### Как получить доступ к сервису onion"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1299,8 +1296,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Устранение неполадок"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### Устранение неисправностей"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2133,6 +2130,11 @@ msgstr ""
 "столкнулись?"
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "Известные проблемы"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2228,6 +2230,11 @@ msgstr ""
 "Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "УДАЛЕНИЕ"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Как удалить Tor Browser из системы"
@@ -2278,227 +2285,79 @@ msgstr ""
 "Обратите внимание на то, что обычная процедура удаления программ вашей "
 "операционной системы не задействуется."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "СТАТЬ ПЕРЕВОДЧИКОМ TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Как стать переводчиком Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Мы будем очень рады вашей помощи проекту в переводе руководства или "
-"интерфейса Tor на ваш язык. Локализация Tor осуществляется командой "
-"[Localization Lab](https://www.localizationlab.org) с помощью Transifex, "
-"стороннего инструмента для переводчиков. Чтобы присоединиться к участникам "
-"проекта, нужно зарегистрироваться на Transifex. Ниже приводятся инструкции "
-"по регистрации и началу работы."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Перед работой, пожалуйста, прочтите страницу Tor Project на  [Localization "
-"Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). Там вы найдете "
-"рекомендации по переводу и ресурсы, которые помогут вам внести свой вклад в "
-"переводы Tor."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### РЕГИСТРАЦИЯ НА TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"Перейдите на <a href=\"https://transifex.com/signup/\">страницу "
-"регистрации</a> Transifex."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Введите свои данные и нажмите кнопку \"Регистрация\":"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Заполните на следующей странице свое имя и выберите \"Локализация\" и "
-"\"Переводчик\" из выпадающих меню:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Выберите \"Присоединиться к существующему проекту\" и нажмите кнопку "
-"\"Вперед\"."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* На следующей странице в раскрывающемся меню выберите языки, на которых вы "
-"говорите."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"Регистрация пройдена! Вас ждет <a "
-"href=\"https://www.transifex.com/otf/torproject/\">страница Tor на "
-"Transifex</a>."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Нажмите синюю кнопку \"Присоединиться к команде\" (справа):"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Выберите в всплывающем меню язык, на который вы хотите переводить:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* В верхней части страницы появится уведомление:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Когда вас добавят в команду, вы сможете приступить к переводу. Просто "
-"перейдите назад к <a "
-"href=\"https://www.transifex.com/otf/torproject/\">странице Tor "
-"Transifex</a> и начинайте переводить."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Скачать Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"В [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"тоже есть информация о переводах с высоким приоритетом."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Спасибо за вашу помощь проекту!"
+"Скачайте Tor Browser и оцените настоящий приватный интернет без слежки и "
+"цензуры."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Наша миссия:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 "продвижение прав и свобод человека путем создания и внедрения бесплатных "
 "технологий анонимности и конфиденциальности с открытым исходным кодом, "
-"поддержка их неограниченной доступности и использования, содействие их "
-"научному и общественному пониманию. "
+"поддержка их неограниченной доступности и использования, а также содействие "
+"их научному и общественному пониманию. "
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Пожертвуйте"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Пожертвовать"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Подписывайтесь на нашу новостную рассылку"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Получайте ежемесячные новости и предложения от Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Получайте ежемесячные новости от Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Подписаться"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"Товарные знаки, уведомления об авторских правах и правила использования "
-"сервиса третьими лицами можно найти здесь: "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Как стать переводчиком для Tor Project"
+"О торговой марке, авторских правах и условиях использования продукта "
+"третьими сторонами можно почитать здесь: %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Логотип Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Меню"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Пожертвуйте"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "ПОЖЕРТВОВАТЬ"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Скачать Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Поиск"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Как стать переводчиком для Tor Project"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Темы"
diff --git a/contents+sr.po b/contents+sr.po
index 6669494f6..67bc47b0b 100644
--- a/contents+sr.po
+++ b/contents+sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Aleksa Ristić, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -53,16 +53,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Dodaci"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Postani Tor prevodioc"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "O Tor Pregledaču"
 
@@ -98,8 +88,6 @@ msgstr "Upravljanje identitetom"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion usluge"
 
@@ -120,24 +108,31 @@ msgstr "Ažuriranje"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Dodaci"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Rešavanje problema"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Deinstaliranje"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Poznati problemi"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Postani Tor prevodioc"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1067,6 +1062,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION USLUGE"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr ""
@@ -1111,8 +1111,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Kako pristupiti onion uslugama"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1134,7 +1134,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1856,6 +1856,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1936,6 +1941,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr ""
@@ -1978,194 +1988,71 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Preuzmi Tor pregledač"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Naša misija:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Донирај"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Doniraj odmah"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Meni"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Донирај"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONIRAJ SADA"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Preuzmi Tor pregledač"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Pretraga"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Теме"
diff --git a/contents+sv-SE.po b/contents+sv-SE.po
index 0aebe6c42..d2e35049e 100644
--- a/contents+sv-SE.po
+++ b/contents+sv-SE.po
@@ -1,14 +1,14 @@
 # Translators:
-# Jonatan Nyberg, 2019
 # erinm, 2019
+# Jonatan Nyberg, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Jonatan Nyberg, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,16 +52,6 @@ msgstr "Kontakt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Pluginer"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Om Tor-webbläsare"
 
@@ -97,8 +87,6 @@ msgstr "Hantera identiteter"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -119,24 +107,31 @@ msgstr "Uppdaterar"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Pluginer"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Felsökning"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Avinstallera"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Kända problem"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Bli en Tor-översättare"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1089,6 +1084,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Tjänster som endast nås via Tor"
@@ -1137,7 +1137,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1164,7 +1164,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1961,6 +1961,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2041,6 +2046,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Hur du raderar Tor webbläsare från ditt system"
@@ -2088,192 +2098,69 @@ msgstr ""
 "Observera att operativsystemets standard \"Avinstallera\"-verktyg inte "
 "används."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Bli en översättare för Tor-projektet"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "Ange din information i fälten och klicka på \"Sign Up\"-knappen:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donera"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donera nu"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Prenumerera på vårt nyhetsbrev"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Registrera"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donera"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+th.po b/contents+th.po
index 4a8c5d0f0..4b67f2acb 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -1,22 +1,23 @@
 # Translators:
 # Ben CM <nebben10814 at gmail.com>, 2019
 # sirawat daengchon <sirawat.gang at gmail.com>, 2019
-# Mumean Muna <muhammadmumin.m at amnesty.or.th>, 2019
 # Wipanee Chamnanphaison <wchamnanphaison at internews.org>, 2019
-# Kunanyaporn Jirasamatakij <kunanyaporn at gmail.com>, 2019
+# Pimsiri Petchnamrob <p.petchnamrob at gmail.com>, 2019
 # Emma Peel, 2019
 # erinm, 2019
 # Krittiya Chankasem <ordinaryjane at gmail.com>, 2019
-# Pimsiri Petchnamrob <p.petchnamrob at gmail.com>, 2019
+# Kunanyaporn Jirasamatakij <kunanyaporn at gmail.com>, 2019
+# Mumean Muna <muhammadmumin.m at amnesty.or.th>, 2019
 # Chumapron Waaddao <chumaporn.t at gmail.com>, 2019
+# DN DN <deen6 at protonmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Chumapron Waaddao <chumaporn.t at gmail.com>, 2019\n"
+"Last-Translator: DN DN <deen6 at protonmail.com>, 2019\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,16 +61,6 @@ msgstr "ผู้ติดต่อ"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "โปรแกรมเสริม"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "ร่วมเป็นผู้แปล Tor"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "เกี่ยวกับ  Tor Browser"
 
@@ -105,8 +96,6 @@ msgstr "การจัดการตัวตน"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "บริการ Onion"
 
@@ -127,24 +116,31 @@ msgstr "กำลังอัปเดต"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "โปรแกรมเสริม"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "การแก้ไขปัญหา"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "ยกเลิกการติดตั้ง"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "ปัญหาที่ทราบ"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "กลายเป็นนักแปล Tor"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1225,6 +1221,11 @@ msgstr ""
 "คุณยังสามารถเข้าถึงตัวเลือกนี้ในจอแสดงผลวงจรใหม่ ในเมนูข้อมูลไซต์ ในแถบ URL"
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "บริการ Onion"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "บริการที่สามารถเข้าถึงโดยการใช้  Tor "
@@ -1280,8 +1281,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### วิธีเข้าถึงบริการ onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1310,8 +1311,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### การแก้ไขปัญหา"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2177,6 +2178,11 @@ msgstr ""
 "issues\">ปัญหาที่ทราบ</a>เพื่อดูว่าปัญหาที่คุณประสบอยู่แสดงอยู่ในรายการนั้นหรือไม่"
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "ประเด็นที่ทราบ"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2272,6 +2278,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">ไม่นิรนามบน Tor</a></mark>"
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "ยกเลิกการติดตั้ง"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "วิธีการลบ Tor บราวเซอร์ ออกจากระบบของคุณ"
@@ -2323,217 +2334,81 @@ msgstr ""
 "โปรดทราบว่าไม่มีการใช้งานระบบปฏิบัติการพื้นฐาน "
 "ไม่มีการใช้โปรแกรมถอดการติดตั้ง"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "ร่วมเป็นผู้แปล TOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "ร่วมเป็นนักแปลกับโครงการ Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"หากคุณสนใจที่จะช่วยเหลือโครงการโดยการแปลคู่มือหรือเบราว์เซอร์ของ Tor "
-"เป็นภาษาของคุณความช่วยเหลือของคุณจะได้รับการชื่นชมอย่างมาก! "
-"การแปลเป็นภาษาท้องถิ่นของ Tor Project ถูกโฮสต์ใน [Localization "
-"Lab](https://www.localizationlab.org) Hub บน Transifex "
-"เครื่องมือแปลของบุคคลที่สาม ในการเริ่มมีส่วนร่วมคุณจะต้องลงทะเบียนกับ "
-"Transifex ด้านล่างนี้เป็นโครงร่างของวิธีการสมัครและเริ่มต้น"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"ก่อนที่จะแปลโปรดอ่านหน้าโครงการของ Tor ใน [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"คุณจะพบแนวทางการแปลและแหล่งข้อมูลที่จะช่วยให้คุณมีส่วนร่วมในการแปลของ Tor"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### ลงทะเบียนบน TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* มุ่งหน้าไปที่ [Transifex signup page](https://transifex.com/signup/)"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "ป้อนข้อมูลของคุณลงในช่องและคลิกปุ่ม 'สมัคร'"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* กรอกชื่อของคุณในหน้าถัดไปแล้วเลือก \"Localization\" และ \"Translator\" "
-"จากเมนูแบบเลื่อนลง"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr "* ในหน้าจอถัดไป เลือก เข้าร่วมโครงการที่มีอยู่ และดำเนินการต่อ"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr "* ในหน้าจอถัดไป เลือกภาษาที่คุณพูดจากเมนูแบบเลื่อนลงและดำเนินการต่อ"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* ตอนนี้คุณสมัครแล้ว ไปต่อที่ [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* คลิ๊กปุ่มสีน้ำเงินที่ด้านขวาสุด เข้าร่วมกลุ่ม "
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* เลือกภาษาที่คุญต้องการแปลจากเมนูรายการ"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* การแจ้งเตือนจะปรากฏขึ้นที่ด้านบนของหน้าจอ"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"หลังจากการเป็นสมาชิกของคุณได้รับการอนุมัติคุณสามารถเริ่มแปลได้ "
-"มีรายการของการแปลที่จำเป็นที่ [Tor "
-"Transifex](https://www.transifex.com/otf/torproject/) "
-"เมื่อคุณพร้อมที่จะเริ่มต้น"
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "ดาวน์โหลด Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"มีข้อมูลเกี่ยวกับการแปลที่มีลำดับความสำคัญที่สูงกว่า"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "ขอบคุณที่ให้ความสนใจในการช่วยเหลือโครงการ"
+"ดาวน์โหลด Tor Browser "
+"เพื่อประสบการณ์การท่องเว็บด้วยความเป็นส่วนตัวอย่างแท้จริง "
+"ปราศจากการติดตามแกะรอย ถูกสอดส่อง หรือการถูกปิดกั้น"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "ภารกิจของเรา"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"เพื่อส่งเสริมสิทธิมนุษยชนและเสรีภาพโดยการสร้างและการปรับใช้ฟรีและโอเพนซอร์ซความเป็นนิรนามและเทคโนโลยีความเป็นส่วนตัวสนับสนุนความพร้อมและการใช้งานที่ไม่"
-" จำกัด ของพวกเขาและการส่งเสริมความเข้าใจทางวิทยาศาสตร์และได้รับความนิยม"
+"เราพัฒนาเพื่อสิทธิมนุษยชนและเสรีภาพ "
+"โดยการสร้างและปรับใช้เทคโนโลยีที่ไม่เปิดเผยชื่อและความเป็นส่วนตัวที่เป็นโอเพนซอร์สและใช้งานฟรี"
+"  สนับสนุนและปลดปล่อยขีดจำกัดในการใช้งาน "
+"ส่งเสริมความเข้าใจด้านวิทยาศาสตร์และค่านิยมของพวกเขา"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "บริจาค"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "บริจาคตอนนี้"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr ""
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "รับการอัพเดตรายเดือนและโอกาสจากโครงการของ Tor"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
-"เครื่องหมายการค้าประกาศลิขสิทธิ์และกฎระเบียบสำหรับการใช้งานโดยบุคคลที่สามสามารถพบได้ในของเรา"
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "โครงการ Tor คู่มือผู้ใช้งาน Tor Browser "
+"เครื่องหมายการค้า, "
+"ประกาศลิขสิทธิ์และกฎระเบียบสำหรับการใช้งานโดยบุคคลที่สามสามารถดูได้ใน "
+"%(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "โลโก้ Tor"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "เมนู"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "บริจาค"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "บริจาคตอนนี้"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "ดาวน์โหลด Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "ค้นหา"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "โครงการ Tor คู่มือผู้ใช้งาน Tor Browser "
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "หัวข้อ"
diff --git a/contents+tr.po b/contents+tr.po
index b994ad30e..cf2195407 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -2,17 +2,17 @@
 # Alperen Kitapçı <alperenmirac at gmail.com>, 2019
 # Cenk Yıldızlı <goncagul at national.shitposting.agency>, 2019
 # ilkeryus <ilkeryus at gmail.com>, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # Kaya Zeren <kayazeren at gmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Kaya Zeren <kayazeren at gmail.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,16 +56,6 @@ msgstr "İletişim"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Uygulama Ekleri"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Tor Çevirmeni Olmak"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Tor Browser Hakkında"
 
@@ -101,8 +91,6 @@ msgstr "Kimlik yönetimi"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Hizmetleri"
 
@@ -123,24 +111,31 @@ msgstr "Güncelleme"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Uygulama Ekleri"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Sorun çözme"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Kaldırma"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Bilinen sorunlar"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Tor Çevirisine Katkıda Bulunabilirsiniz"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1243,6 +1238,11 @@ msgstr ""
 "menüsünden de erişebilirsiniz."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION HİZMETLERİ"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Yalnız Tor kullanılarak erişilebilen hizmetler"
@@ -1301,8 +1301,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Onion hizmetine nasıl erişilir"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### BİR ONION HİZMETİNE NASIL ERİŞİLİR"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1332,8 +1332,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Sorun çözme"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### SORUN ÇÖZME"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2228,6 +2228,11 @@ msgstr ""
 "sorunun buradaki listede olup olmadığına bakın."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "BİLİNEN SORUNLAR"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2327,6 +2332,11 @@ msgstr ""
 "değildir</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "KALDIRMAK"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Tor Browser bilgisayarınızdan nasıl kaldırılır"
@@ -2378,229 +2388,81 @@ msgstr ""
 "Kaldırma işlemi için işletim sisteminizde bulunan standart \"Uygulama "
 "Kaldırma\" aracının kullanılmayacağını unutmayın."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "BİR TOR ÇEVİRMENİ OLMAK"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Tor Projesi için bir çevirmen olmak"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"Tor Browser rehberinin çevirisine katkıda bulunmak istiyorsanız minnettar "
-"oluruz. Tor Browser çevirileri bir çeviri hizmeti sağlayıcısı olan Transifex"
-" üzerindeki [Localization Lab](https://www.localizationlab.org) projesinde "
-"bulunur. Çeviriye katkıda bulunmak için bir Transifex hesabı açmanız "
-"gerekir. Hesap açmak ve çeviriye başlamak için gerekli bilgileri aşağıda "
-"bulabilirsiniz:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Çeviriye başlamadan önce [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) üzerindeki Tor Project"
-" sayfasını okuyun. Tor çevirilerine katkıda bulunmanızda yardımcı olacak "
-"çeviri yönergeleri ve kaynaklarını burada bulabilirsiniz."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### TRANSIFEX ÜZERİNDE HESAP AÇMAK"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* [Transifex hesap açma sayfasına](https://transifex.com/signup/) gidin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Form alanlarına bilgilerinizi yazdıktan sonra \"Hesap Açın\" düğmesine "
-"tıklayın:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Sonraki sayfaya adınızı yazın ve açılan menülerden \"Yerelleştirme\" ile "
-"\"Çevirmen\" seçeneklerini seçin:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-"* Sonraki sayfada 'Var olan bir projeye katılın' seçeneğini seçin ve "
-"ilerleyin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* Sonraki sayfada açılan menüden konuştuğunuz dilleri seçin ve ilerleyin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* Hesabınız açıldı! [Tor Transifex "
-"sayfasına](https://www.transifex.com/otf/torproject/) geçin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Sağ taraftaki mavi 'Takıma Katılın' düğmesine tıklayın:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* Açılan menüden çevirmek istediğiniz dili seçin:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* Sayfanın üst bölümünde şu şekilde bir bildirim görüntülenir:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"Üyeliğiniz onaylandıktan sonra çeviri işlemlerine başlayabilirsiniz. "
-"Başlamaya hazır olduğunuzda çevrilmesi gereken dizgeleri görmek için [Tor "
-"Transifex Sayfasına](https://www.transifex.com/otf/torproject/) "
-"bakabilirsiniz."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Tor Browser İndir"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"Ayrıca [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) sayfasında hangi "
-"çevirilerin daha öncelikli yapılması gerektiği hakkında bilgileri de "
-"bulabilirsiniz."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Projeye vereceğiniz destek için teşekkür ederiz!"
+"İzleme, gözetleme ya da engelleme olmadan kişisel gizliliğinizi "
+"koruyabileceğiniz gerçek taramayı deneyimlemek için Tor Browser uygulamasını"
+" indirin."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Misyonumuz:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"özgür ve açık kaynaklı anonimlik ve kişisel gizlilik teknolojileri "
+"Özgür ve açık kaynaklı anonimlik ve kişisel gizlilik teknolojileri "
 "geliştirerek insan hakları ve özgürlükleri geliştirmek, bu teknolojilere "
 "kısıtlamasız olarak erişilebilmesini sağlamak ile bilimsel ve yaygın olarak "
 "anlaşılmasını sağlamak."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Bağış Yapın"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Bağış Yapın"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Duyurularımıza Abone Olun"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
-"Tor Projesinden aylık güncelleme ve fırsatlar ile ilgili bilgi alabilirsiniz"
+"Tor Projesi ile ilgili güncelleme ve bilgileri aylık olarak alabilirsiniz:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Kayıt olun"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Üçüncü tarafların kullanabileceği patent, telif hakkı ve ilkeleri şurada "
-"bulabilirsiniz "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Projesi | Tor Browser Rehberi"
+"bulabilirsiniz %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logosu"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menü"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Bağış Yapın"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "BAĞIŞ YAPIN"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Tor Browser İndir"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Arama"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Projesi | Tor Browser Rehberi"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Başlıklar"
diff --git a/contents+uk.po b/contents+uk.po
index 31059fe30..b4e8b7eff 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -1,15 +1,16 @@
 # Translators:
-# erinm, 2019
 # Emma Peel, 2019
+# erinm, 2019
 # CuAl40qp, 2019
+# Sergio Thirdlingson <serge3ling at gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: CuAl40qp, 2019\n"
+"Last-Translator: Sergio Thirdlingson <serge3ling at gmail.com>, 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,16 +54,6 @@ msgstr "Контакти"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Про Tor Browser"
 
@@ -98,8 +89,6 @@ msgstr "Керування ідентичностями"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -120,24 +109,31 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Виправлення неполадок"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr ""
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr ""
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1125,6 +1121,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Послуги, доступні лише для використання Tor"
@@ -1176,7 +1177,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1199,8 +1200,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Виправлення неполадок"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1921,6 +1922,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2001,6 +2007,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr ""
@@ -2043,192 +2054,69 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr ""
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Пожертвувати"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Підтримати зараз"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Зареєструватися"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Пожертвувати"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+vi.po b/contents+vi.po
index 2695804b9..0dbd5d235 100644
--- a/contents+vi.po
+++ b/contents+vi.po
@@ -1,15 +1,16 @@
 # Translators:
-# Ngo Long <ngotienlong1996 at gmail.com>, 2019
 # erinm, 2019
 # Emma Peel, 2019
+# Ngo Long <ngotienlong1996 at gmail.com>, 2019
+# Henry Tran <henry.trancsr at gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Henry Tran <henry.trancsr at gmail.com>, 2019\n"
 "Language-Team: Vietnamese (https://www.transifex.com/otf/teams/1519/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,16 +54,6 @@ msgstr "Liên hệ"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Thông tin về Trình duyệt Tor"
 
@@ -98,8 +89,6 @@ msgstr "Quản trị các định danh"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Các Dịch vụ Onion"
 
@@ -120,24 +109,31 @@ msgstr "Cập nhật"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Giải quyết vấn đề"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Huỷ cài đặt"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Các vấn đề đã biết"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "người dịch-những sự đóng góp"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1159,6 +1155,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Các dịch vụ chỉ có thể truy cập được thông qua Tor."
@@ -1215,8 +1216,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### Làm thế nào để truy cập một dịch vụ onion"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1238,8 +1239,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Giải quyết vấn đề"
+msgid "##### TROUBLESHOOTING"
+msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2085,6 +2086,11 @@ msgstr ""
 "nghiệm đã được liệt kê ở đó rồi."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2180,6 +2186,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "Làm thế nào để gỡ bỏ Trình duyệt Tor khỏi hệ thống"
@@ -2226,192 +2237,69 @@ msgid ""
 msgstr ""
 "Lưu ý là ứng dụng “Huỷ cài đặt” chuẩn của hệ điều hành không được sử dụng."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Quyên góp"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Đóng góp Ngay bây giờ"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr ""
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr ""
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Quyên góp"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 73bd90c7f..9865574ef 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -1,17 +1,17 @@
 # Translators:
-# ef082130671b50894cb0f0340a268c8b, 2019
+# ef082130671b50894cb0f0340a268c8b, 2018
 # MD Rights <psychi2009 at gmail.com>, 2019
 # erinm, 2019
 # 耀石 徐 <xuyaoshix at gmail.com>, 2019
-# ff98sha, 2019
 # Emma Peel, 2019
+# ff98sha, 2019
 # PCloud <heige.pcloud at outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: PCloud <heige.pcloud at outlook.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -57,16 +57,6 @@ msgstr "联系方式"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "插件"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "成为 Tor 翻译者"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "关于 Tor 浏览器"
 
@@ -102,8 +92,6 @@ msgstr "管理身份"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "洋葱服务"
 
@@ -124,24 +112,31 @@ msgstr "更新"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "插件"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "故障排除"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "卸载"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "已知问题"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "成为 Tor 翻译者"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1073,6 +1068,11 @@ msgid ""
 msgstr "你也可以从地址栏的网站信息菜单中选择“新的 Tor 线路”来进入此选项。"
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "洋葱服务"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "只能使用洋葱路由访问的服务"
@@ -1121,8 +1121,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### 如何访问一个洋葱服务"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### 如何访问洋葱服务"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1148,8 +1148,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### 故障排除"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### 疑难解答"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1913,6 +1913,11 @@ msgstr ""
 "issues\">已知问题</a>页面了解您遭遇的问题是否已被收录其中。"
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "已知问题"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1997,6 +2002,11 @@ msgstr ""
 "idea\">即使通过 Tor 网络,BitTorrent 也不是匿名的</a></mark>。"
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "卸载"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "如何在您的系统上删除 Tor 浏览器"
@@ -2041,204 +2051,72 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "注意:无需使用您的系统提供的标准的“卸载”工具。"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "成为 Tor 的翻译者"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "成为 Tor Project 的翻译者"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"如果您对帮助我们将 Tor 浏览器或这篇文档翻译成您的语言感兴趣,非常感谢您的帮助!您本项目托管在第三方网站 Transifex 上的 "
-"[Localization Lab](https://www.localizationlab.org) 项目。下面是如何注册和开始翻译的流程的简单概括。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"开始翻译之前,请通读 [Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor) 上的 Tor "
-"项目页面。在那里,您可以找到翻译准则和能够帮助您翻译 Tor 的资源"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### 在 Transfiex 上注册"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr "* 前往 [Transifex 的注册页面](https://transifex.com/signup/)。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr "输入您的信息并点击 \"Sign Up\" 按钮:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr "* 在下一页中填写您的名字,从下拉菜单中选择 \"Localization\"(本地化)和 \"Translator\" (翻译者)。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr "* 在下一页中,选择 \"Join an existing project\"(加入现有的项目)并继续。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr "* 在下一页,从下拉菜单中选择您使用的语言并点击继续。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* 你现在已经登入!前往 [Tor Transifex 页面](https://www.transifex.com/otf/torproject/)。"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* 点击最右端的蓝色“Join Team”按钮"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr "* 在下拉菜单中选择你想要翻译的语言:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* 在屏幕上端会有这样的通知出现:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"当您的成员资格被批准之后,您就可以开始翻译工作了。当您准备好开始的时候,在 [Tor Transifex "
-"页面](https://www.transifex.com/otf/torproject/) 有需要翻译的列表。"
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "下载Tor浏览器"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"中有更多关于翻译的信息。"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr "下载 Tor 浏览器,体验真正的私密浏览,不被追踪、监视或审查。"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "感谢您有兴趣对这个项目做出贡献!"
-
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "我们的任务:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
-msgstr "通过创建和部署自由和开源的匿名和隐私技术,支持他们不受限制的使用性,以及提高他们对科学和普世价值的认知,来促进人权和自由的发展。"
+msgstr ""
+"通过开发和部署自由和开源的匿名和隐私技术,来支持人们不受限制地使用网络,以及提高他们对科学和普世价值的认知,并增进他们对科学和日常知识的理解。"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "捐款"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "立即捐助"
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "订阅我们的新闻"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "订阅我们每个月发布的消息和机遇"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "获取 Tor Project 每月发布的更新和机遇:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "订阅"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-msgstr "商标保护,专利保护,以及第三方使用规则可以在这里找到 "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor 项目 | Tor 浏览器用户手册"
+"found in our %(link_to_faq)s"
+msgstr "商标保护、版权保护以及第三方使用规则可以在 %(link_to_faq)s 找到"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor标识"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "菜单"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "捐款"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "立即捐助"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "下载Tor浏览器"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "搜索"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor 项目 | Tor 浏览器用户手册"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "主题"
diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index 5ab2d0bbd..cb48fbb18 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Hsiu-Ming Chang <cges30901 at gmail.com>, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -53,16 +53,6 @@ msgstr "聯絡"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "外掛程式"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr ""
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "關於洋蔥路由瀏覽器"
 
@@ -98,8 +88,6 @@ msgstr "身分管理"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr ""
 
@@ -120,24 +108,31 @@ msgstr "更新中"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "外掛程式"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "錯誤處理"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "反安裝中"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "已知的問題"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1023,6 +1018,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "只有透過洋蔥路由才能存取的服務"
@@ -1067,7 +1067,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1090,7 +1090,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1829,6 +1829,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr ""
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -1909,6 +1914,11 @@ msgid ""
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "如何從您的系統中移除洋蔥路由瀏覽器"
@@ -1951,192 +1961,69 @@ msgid ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 msgstr "請注意,您作業系統中的標準「反安裝」工具並未被使用。"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
 msgstr ""
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-msgstr ""
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr ""
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "捐助"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "立刻捐款"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr ""
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
 msgstr ""
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "註冊"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
 msgstr ""
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr ""
-
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "捐助"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr ""
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
+#: lego/templates/search.html:5 templates/search.html:5
+msgid "Search"
 msgstr ""
 
-#: templates/search.html:5
-msgid "Search"
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
 msgstr ""
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
diff --git a/contents.pot b/contents.pot
index d94ef2027..6eb7bd87e 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 12:39+CET\n"
+"POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: en <LL at li.org>\n"
@@ -48,16 +48,6 @@ msgstr "Contact"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Becoming a Tor translator"
-msgstr "Becoming a Tor translator"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "About Tor Browser"
 
@@ -93,8 +83,6 @@ msgstr "Managing identities"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/onion-services/
-#: (content/onion-services/contents+en.lrtopic.title)
 msgid "Onion Services"
 msgstr "Onion Services"
 
@@ -115,24 +103,31 @@ msgstr "Updating"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Plugins"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "Troubleshooting"
 msgstr "Troubleshooting"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/uninstalling/
-#: (content/uninstalling/contents+en.lrtopic.title)
 msgid "Uninstalling"
 msgstr "Uninstalling"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/known-issues/
-#: (content/known-issues/contents+en.lrtopic.title)
 #: (content/known-issues/contents+en.lrtopic.description)
 msgid "Known issues"
 msgstr "Known issues"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Becoming a Tor Translator"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
@@ -1217,6 +1212,11 @@ msgstr ""
 "information menu, in the URL bar."
 
 #: https//tb-manual.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "ONION SERVICES"
+msgstr "ONION SERVICES"
+
+#: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.description)
 msgid "Services that are only accessible using Tor"
 msgstr "Services that are only accessible using Tor"
@@ -1274,8 +1274,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### How to access an onion service"
-msgstr "##### How to access an onion service"
+msgid "##### HOW TO ACCESS AN ONION SERVICE"
+msgstr "##### HOW TO ACCESS AN ONION SERVICE"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1305,8 +1305,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
-msgid "##### Troubleshooting"
-msgstr "##### Troubleshooting"
+msgid "##### TROUBLESHOOTING"
+msgstr "##### TROUBLESHOOTING"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -2178,6 +2178,11 @@ msgstr ""
 " there."
 
 #: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+msgid "KNOWN ISSUES"
+msgstr "KNOWN ISSUES"
+
+#: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
@@ -2273,6 +2278,11 @@ msgstr ""
 "/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "UNINSTALLING"
+msgstr "UNINSTALLING"
+
+#: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.description)
 msgid "How to remove Tor Browser from your system"
 msgstr "How to remove Tor Browser from your system"
@@ -2323,225 +2333,79 @@ msgid ""
 msgstr ""
 "Note that your operating system’s standard “Uninstall” utility is not used."
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.title)
-msgid "BECOMING A TOR TRANSLATOR"
-msgstr "BECOMING A TOR TRANSLATOR"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.description)
-msgid "Becoming a translator for the Tor Project"
-msgstr "Becoming a translator for the Tor Project"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-msgstr ""
-"If you are interested in helping out the project by translating the manual "
-"or the Tor Browser to your language, your help would be greatly appreciated!"
-" Tor Project localization is hosted in the [Localization "
-"Lab](https://www.localizationlab.org) Hub on Transifex, a third-party  "
-"translation tool. In order to begin contributing you will have to sign up "
-"with Transifex. Below is an outline of how to sign up and begin."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-msgstr ""
-"Before translating, please read through the Tor Project page on the "
-"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). "
-"There you will find translation guidelines and resources that will help you "
-"contribute to Tor translations."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "##### SIGNING UP ON TRANSIFEX"
-msgstr "##### SIGNING UP ON TRANSIFEX"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-msgstr ""
-"* Head over to the [Transifex signup page](https://transifex.com/signup/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
-"Enter your information into the fields and click the 'Sign Up' button:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-msgstr ""
-"* Fill out the next page with your name and select \"Localization\" and "
-"\"Translator\" from the drop-down menus:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr2.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* On the next page, select 'Join an existing project' and continue."
-msgstr "* On the next page, select 'Join an existing project' and continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-msgstr ""
-"* On the next page, select the languages you speak from the drop-down menu "
-"and continue."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-msgstr ""
-"* You are now signed up! Go to the [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/)."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* Click the blue 'Join Team' button on the far right:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr3.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
-"* Select the language you would like to translate from the dropdown menu:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr4.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "* A notification will now show up on the top of the page like so:"
-msgstr "* A notification will now show up on the top of the page like so:"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-msgstr "<img class=\"col-md-6\" src=\"../../static/images/tr5.png\">"
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
-msgstr ""
-"After your membership is approved you can begin translating; there is a list"
-" of needed translations at [Tor Transifex "
-"page](https://www.transifex.com/otf/torproject/) when you are ready to "
-"begin."
+#: lego/templates/footer.html:9 lego/templates/footer.html:18
+#: lego/templates/navbar.html:71 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:71
+msgid "Download Tor Browser"
+msgstr "Download Tor Browser"
 
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+#: lego/templates/footer.html:10 templates/footer.html:10
 msgid ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 msgstr ""
-"The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
-"also has information about the translations with bigger priority."
-
-#: https//tb-manual.torproject.org/becoming-tor-translator/
-#: (content/becoming-tor-translator/contents+en.lrtopic.body)
-msgid "Thanks for your interest in helping the project!"
-msgstr "Thanks for your interest in helping the project!"
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:27 templates/footer.html:27
 msgid "Our mission:"
 msgstr "Our mission:"
 
-#: templates/footer.html:5
+#: lego/templates/footer.html:28 templates/footer.html:28
 msgid ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
-"to advance human rights and freedoms by creating and deploying free and open"
+"To advance human rights and freedoms by creating and deploying free and open"
 " source anonymity and privacy technologies, supporting their unrestricted "
 "availability and use, and furthering their scientific and popular "
 "understanding."
 
-#: templates/footer.html:24
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate"
+msgstr "Donate"
+
+#: lego/templates/footer.html:49 lego/templates/navbar.html:15
+#: templates/footer.html:49 templates/navbar.html:15
+msgid "Donate Now"
+msgstr "Donate Now"
+
+#: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
 msgstr "Subscribe to our Newsletter"
 
-#: templates/footer.html:25
-msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Get monthly updates and opportunities from the Tor Project"
+#: lego/templates/footer.html:55 templates/footer.html:55
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr "Get monthly updates and opportunities from the Tor Project:"
 
-#: templates/footer.html:26
+#: lego/templates/footer.html:56 templates/footer.html:56
 msgid "Sign up"
 msgstr "Sign up"
 
-#: templates/footer.html:32
+#: lego/templates/footer.html:75 templates/footer.html:75
+#, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
+"found in our %(link_to_faq)s"
 msgstr ""
 "Trademark, copyright notices, and rules for use by third parties can be "
-"found in our "
-
-#: templates/layout.html:8
-msgid "Tor Project | Tor Browser Manual"
-msgstr "Tor Project | Tor Browser Manual"
+"found in our %(link_to_faq)s"
 
-#: templates/navbar.html:4
-msgid "Tor Logo"
-msgstr "Tor Logo"
+#: lego/templates/navbar.html:18 templates/navbar.html:18
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/navbar.html:6
-msgid "Donate"
-msgstr "Donate"
-
-#: templates/navbar.html:6
-msgid "DONATE NOW"
-msgstr "DONATE NOW"
-
-#: templates/navbar.html:41
-msgid "Download Tor Browser"
-msgstr "Download Tor Browser"
-
-#: templates/search.html:5
+#: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
 msgstr "Search"
 
+#: templates/layout.html:8
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser Manual"
+
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
 msgstr "Topics"



More information about the tor-commits mailing list