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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
From: translation@xxxxxxxxxxxxxx
Date: Tue, 27 Aug 2019 12:28:11 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 27 Aug 2019 08:28:56 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 30843ea234d9c5973b122564746ffbafa8f91284
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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@xxxxxxxxx>, 2018
-# ButterflyOfFire, 2018
-# Ahmed A. <6622227a@xxxxxxxxx>, 2019
 # Ramy Rostom <ramyrostom@xxxxxxxxxxxxxx>, 2019
 # erinm, 2019
-# Ahmed IB <mee.tbhole@xxxxxxxxx>, 2019
+# Khaled Hosny, 2019
 # Emma Peel, 2019
+# Ahmed A. <6622227a@xxxxxxxxx>, 2019
+# Ahmed IB <mee.tbhole@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxx>, 2018
-# Al Shahrior Hasan Sagor <shahrior3814@xxxxxxxxx>, 2019
+# Al Shahrior Hasan Sagor <shahrior3814@xxxxxxxxx>, 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@xxxxxxxxx>, 2019
+# Marc Ripoll <markripesp@xxxxxxxxx>, 2018
 # Sandra Monferrer <smonferrer@xxxxxxxxx>, 2019
-# erinm, 2019
 # jmontane, 2019
+# erinm, 2019
+# Ecron <ecron_89@xxxxxxxxxxx>, 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@xxxxxxxx>, 2018
 # MikulÃ¡Å¡ Vrba <mikulasvrba@xxxxxxxxx>, 2018
 # Michal VÃ¡rady <miko.vaji@xxxxxxxxx>, 2019
-# Michal Stanke <mstanke@xxxxxxxxxx>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # David Stepan <stepand@xxxxxxxxxx>, 2019
+# Emma Peel, 2019
+# Michal Stanke <mstanke@xxxxxxxxxx>, 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@xxxxxxxxxx>, 2019\n"
+"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>, 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@xxxxxxxxx>, 2018
-# Oliver Parczyk, 2019
-# Marcel Haring <getting@xxxxxxxxxxxxx>, 2019
 # erinm, 2019
+# Marcel Haring <getting@xxxxxxxxxxxxx>, 2019
 # Emma Peel, 2019
 # Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 2019
-# Panagiotis Vasilopoulos, 2019
+# Elektra M. <safiragon@xxxxxxxx>, 2018
+# A Papac <ap909219@xxxxxxxxxxxxxx>, 2018
+# Panagiotis Vasilopoulos, 2018
 # erinm, 2019
 # Adrian Pappas <pappasadrian@xxxxxxxxx>, 2019
-# Elektra M. <safiragon@xxxxxxxx>, 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@xxxxxxxxxxx>, 2019
 # erinm, 2019
+# Andi Chandler <andi@xxxxxxxxxxx>, 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@xxxxxxxxxxx>, 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@ADDRESS>\n"
 "Language-Team: en <LL@xxxxxx>\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@xxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
-# erinm, 2019
-# Reza Ghasemi, 2019
 # Vox, 2019
 # Seyyed Hossein Darvari <xhdix@xxxxxxxxx>, 2019
+# MYZJ, 2019
+# Goudarz Jafari <goudarz.jafari@xxxxxxxxx>, 2019
+# erinm, 2019
 # Emma Peel, 2019
+# A.Mehraban <Mehr.Ban@xxxxxxxxx>, 2019
 # Arya Abidi <arya.abidi@xxxxxxxxx>, 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@xxxxxxxxx>, 2019
-# Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2019
-# erinm, 2019
-# Emma Peel, 2019
+# Emma Peel, 2018
 # AO <ao@xxxxxxxxxxxxxxxxxxx>, 2019
+# erinm, 2019
+# Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxxxxxxx>, 2019\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # Emma Peel, 2019
 # erinm, 2019
 # vargaviktor <viktor.varga@xxxxxxxxx>, 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@xxxxxxxxxx>, 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@xxxxxxxxxxx>, 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@xxxxxxxxxxxxxxxx>, 2018
 # Random_R, 2019
 # francesco ercolani <erco99@xxxxxxx>, 2019
+# Lorenzo Mazza <lor.mazza81@xxxxxxxxxxx>, 2019
 # erinm, 2019
-# Davide Sant <spuuu@xxxxxxxxxx>, 2019
 # Emma Peel, 2019
 # Giandomenico Lombardi <transifex.com@xxxxxx>, 2019
-# Lorenzo Mazza <lor.mazza81@xxxxxxxxxxx>, 2019
+# Davide Sant <spuuu@xxxxxxxxxx>, 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@xxxxxxxxxxx>, 2019\n"
+"Last-Translator: Davide Sant <spuuu@xxxxxxxxxx>, 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@xxxxx>, 2018
-# Johnny Cho <popeye92@xxxxxxxxx>, 2019
 # erinm, 2019
+# Johnny Cho <popeye92@xxxxxxxxx>, 2019
 # Emma Peel, 2019
 # park seungbin <parksengbin48@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxxxxxx>, 2018
 # erinm, 2019
-# Moo, 2019
 # Tautvydas Å½., 2019
+# Moo, 2019
+# Benas Buivydas <benas@xxxxxxxxxxxxx>, 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@xxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2018
-# Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # Matej Plavevski <matej.plavevski+github@xxxxxxxxx>, 2019
+# Emma Peel, 2019
+# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2019
+# Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 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@xxxxxxxxx>, 2019\n"
+"Last-Translator: Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxxxxxxxxx>, 2018
-# erinm, 2019
-# john martinsen <rsa@xxxxxxxxxxx>, 2019
 # JÃ¸rgen Moen Isaksen <klokkefriken2@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # bacovane <bart-ts@xxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx, 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@xxxxxxxxxxxxxx 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@xxxxxxxxxxxxxx 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@xxxxx>, 2018
-# Dawid Job <hoek@xxxxxxx>, 2019
-# erinm, 2019
-# Dawid Potocki <dpot@xxxxxxxxxxx>, 2019
+# Dawid Job <hoek@xxxxxxx>, 2018
 # Emma Peel, 2019
+# erinm, 2019
 # Waldemar Stoczkowski, 2019
+# Filip <filipiczesio@xxxxx>, 2019
+# Dawid Potocki <dpot@xxxxxxxxxxx>, 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@xxxxxxxxxxx>, 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@xxxxxxxxxx>, 2018
-# Alexei GonÃ§alves de Oliveira <alexis@xxxxxxxxxxxxxxxxxxx>, 2018
+# Chacal E., 2019
 # Communia <ameaneantie@xxxxxxxxxx>, 2019
 # erinm, 2019
+# Emma Peel, 2019
 # Eduardo Addad de Oliveira <eduardoaddad@xxxxxxxxxxx>, 2019
+# Alexei GonÃ§alves de Oliveira <alexis@xxxxxxxxxxxxxxxxxxx>, 2019
 # Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
-# Rui <xymarior@xxxxxxxxxx>, 2019
 # Hugo9191 <hugoncosta@xxxxxxxxx>, 2019
+# Rui <xymarior@xxxxxxxxxx>, 2019
+# Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019
+# Nuno Rego <nuno.rego@xxxxxxxxxxx>, 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@xxxxxxxxx>, 2019\n"
+"Last-Translator: Nuno Rego <nuno.rego@xxxxxxxxxxx>, 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@xxxxxxxx>, 2018
 # erinm, 2019
-# A C <ana@xxxxxxxxxxxx>, 2019
-# Emma Peel, 2019
 # eduard pintilie <eduard.pintilie@xxxxxxxxx>, 2019
+# Emma Peel, 2019
+# A C <ana@xxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019\n"
+"Last-Translator: A C <ana@xxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # JZDLin, 2019
-# Andrey, 2019
 # Sergey Leschina <mail@xxxxxxxxxxx>, 2019
 # erinm, 2019
-# solokot <solokot@xxxxxxxxx>, 2019
 # Valentine Bobrovsy <vbabrouski@xxxxxxxxxxx>, 2019
-# Legenden Rifk <rekytcsgo@xxxxxxxxx>, 2019
 # Emma Peel, 2019
 # Sergey Smirnov <cj75300@xxxxxxxxx>, 2019
-# Ð?Ð²Ð°Ð½ Ð?Ð²Ð°Ð½Ð¾Ð² <remove4kebab@xxxxxxxxxxxxxx>, 2019
+# Legenden Rifk <rekytcsgo@xxxxxxxxx>, 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@xxxxxxxxxxxxxx>, 2019\n"
+"Last-Translator: Legenden Rifk <rekytcsgo@xxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # sirawat daengchon <sirawat.gang@xxxxxxxxx>, 2019
-# Mumean Muna <muhammadmumin.m@xxxxxxxxxxxxx>, 2019
 # Wipanee Chamnanphaison <wchamnanphaison@xxxxxxxxxxxxx>, 2019
-# Kunanyaporn Jirasamatakij <kunanyaporn@xxxxxxxxx>, 2019
+# Pimsiri Petchnamrob <p.petchnamrob@xxxxxxxxx>, 2019
 # Emma Peel, 2019
 # erinm, 2019
 # Krittiya Chankasem <ordinaryjane@xxxxxxxxx>, 2019
-# Pimsiri Petchnamrob <p.petchnamrob@xxxxxxxxx>, 2019
+# Kunanyaporn Jirasamatakij <kunanyaporn@xxxxxxxxx>, 2019
+# Mumean Muna <muhammadmumin.m@xxxxxxxxxxxxx>, 2019
 # Chumapron Waaddao <chumaporn.t@xxxxxxxxx>, 2019
+# DN DN <deen6@xxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019\n"
+"Last-Translator: DN DN <deen6@xxxxxxxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # Cenk YÄ±ldÄ±zlÄ± <goncagul@national.shitposting.agency>, 2019
 # ilkeryus <ilkeryus@xxxxxxxxx>, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # Kaya Zeren <kayazeren@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # erinm, 2019
 # Emma Peel, 2019
+# Ngo Long <ngotienlong1996@xxxxxxxxx>, 2019
+# Henry Tran <henry.trancsr@xxxxxxxxx>, 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@xxxxxxxxx>, 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@xxxxxxxxx>, 2019
 # erinm, 2019
 # è??ç?³ å¾? <xuyaoshix@xxxxxxxxx>, 2019
-# ff98sha, 2019
 # Emma Peel, 2019
+# ff98sha, 2019
 # PCloud <heige.pcloud@xxxxxxxxxxx>, 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@xxxxxxxxxxx>, 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@xxxxxxxxx>, 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@ADDRESS>\n"
 "Language-Team: en <LL@xxxxxx>\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"

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

Prev by Author: [tor-commits] [translation/exoneratorproperties] Update translations for exoneratorproperties
Next by Author: [tor-commits] [translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
Previous by thread: [tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
Next by thread: [tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
Index(es):
- Author
- Thread