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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
From: translation@xxxxxxxxxxxxxx
Date: Thu, 14 Nov 2019 12:54:58 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 14 Nov 2019 07:55:25 -0500
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 a5b5aee2a98c75c8150302f8c31c6cc5a9f71bca
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Thu Nov 14 12:54:54 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po    | 59 ++++++++++++++++++++-------------
 contents+bn.po    | 73 +++++++++++++++++++++++-----------------
 contents+ca.po    | 77 ++++++++++++++++++++++++-------------------
 contents+cs.po    | 59 ++++++++++++++++++++-------------
 contents+da.po    | 59 ++++++++++++++++++++-------------
 contents+de.po    | 96 ++++++++++++++++++++++++++++++++++++++++-------------
 contents+el.po    | 65 ++++++++++++++++++++----------------
 contents+es-AR.po | 59 ++++++++++++++++++++-------------
 contents+es.po    | 76 ++++++++++++++++++++++++------------------
 contents+fa.po    | 59 ++++++++++++++++++++-------------
 contents+fo.po    | 59 ++++++++++++++++++++-------------
 contents+fr.po    | 63 +++++++++++++++++++++--------------
 contents+ga.po    | 59 ++++++++++++++++++++-------------
 contents+gu.po    | 59 ++++++++++++++++++++-------------
 contents+he.po    | 59 ++++++++++++++++++++-------------
 contents+hi.po    | 59 ++++++++++++++++++++-------------
 contents+hu.po    | 59 ++++++++++++++++++++-------------
 contents+id.po    | 65 +++++++++++++++++++++++-------------
 contents+is.po    | 59 ++++++++++++++++++++-------------
 contents+it.po    | 81 +++++++++++++++++++++++----------------------
 contents+ja.po    | 59 ++++++++++++++++++++-------------
 contents+ka.po    | 98 ++++++++++++++++++++++++------------------------------
 contents+ko.po    | 59 ++++++++++++++++++++-------------
 contents+mk.po    | 59 ++++++++++++++++++++-------------
 contents+ml.po    | 84 +++++++++++++++++++++-------------------------
 contents+my.po    | 59 ++++++++++++++++++++-------------
 contents+nb.po    | 59 ++++++++++++++++++++-------------
 contents+nl.po    | 59 ++++++++++++++++++++-------------
 contents+pl.po    | 59 ++++++++++++++++++++-------------
 contents+pt-BR.po | 62 ++++++++++++++++++++--------------
 contents+pt-PT.po | 59 ++++++++++++++++++++-------------
 contents+ro.po    | 59 ++++++++++++++++++++-------------
 contents+ru.po    | 63 +++++++++++++++++++++--------------
 contents+sr.po    | 59 ++++++++++++++++++++-------------
 contents+sv.po    | 59 ++++++++++++++++++++-------------
 contents+sw.po    | 59 ++++++++++++++++++++-------------
 contents+th.po    | 59 ++++++++++++++++++++-------------
 contents+tr.po    | 99 +++++++++++++++++++++++++------------------------------
 contents+uk.po    | 59 ++++++++++++++++++++-------------
 contents+zh-CN.po | 67 ++++++++++++++++++++++++-------------
 contents+zh-TW.po | 63 +++++++++++++++++++++--------------
 contents.pot      | 97 ++++++++++++++++++++++++++++++-----------------------
 42 files changed, 1666 insertions(+), 1097 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index adfcd7e32..4ea050a79 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
@@ -898,8 +898,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -965,8 +965,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1171,14 +1171,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1191,7 +1191,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1219,6 +1219,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1241,6 +1251,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2325,8 +2340,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2473,7 +2488,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2534,7 +2549,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3785,8 +3800,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4351,7 +4366,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7466,7 +7481,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7543,9 +7558,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8227,8 +8242,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "ØªØ¨Ø±Ø¹ Ø§Ù?Ù?Ù?Ù?Ø? Ù?Ø³ØªØ¬Ø§Ø±Ù?Ù? Ù?Ù?Ø²Ù?Ù?Ø§ Ù?ØªØ¨Ø±Ø¹ Ø¨Ù?Ù?Ø³ Ø§Ù?Ù?Ø¨Ù?Øº."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "ØªÙ?Ø²Ù?Ù? Ù?ØªØµÙ?Ø ØªÙ?Ø±"
 
diff --git a/contents+bn.po b/contents+bn.po
index bb94fafd0..878e7e86a 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -936,8 +936,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1003,8 +1003,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1210,16 +1210,20 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
+"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1230,9 +1234,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
+"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1258,6 +1264,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1283,6 +1299,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2547,13 +2568,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"à¦?à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦?à§?à¦¯à¦¾à¦¨à§?à¦?à¦¿-à¦à¦¾à¦?à¦°à¦¾à¦¸ à¦?à¦¾à¦²à¦¾à¦?à§?à¦?à§?à¦¨, à¦¤à¦¾à¦¹à¦²à§? à¦¦à¦¯à¦¼à¦¾ à¦?à¦°à§? à¦¦à§?à¦?à§?à¦¨ [à¦?à¦®à¦¾à¦° "
-"à¦?à§?à¦¯à¦¾à¦¨à§?à¦?à¦¿à¦à¦¾à¦?à¦°à¦¾à¦¸/à¦®à§?à¦¯à¦¾à¦²à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦° à¦¸à§?à¦°à¦?à§?à¦·à¦¾ à¦?à¦®à¦¾à¦?à§? à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦°à§? à¦ªà§?à¦°à¦¬à§?à¦¶ à¦¥à§?à¦?à§? à¦?à¦?à¦?à¦¾à¦¤à§? "
-"à¦¯à¦¾à¦?à§?à¦?à§?](https://support.torproject.org/#tbb-10), à¦?à¦?à¦¾ à¦¸à¦¾à¦§à¦¾à¦°à¦£ "
-"à¦?à§?à¦¯à¦¾à¦¨à§?à¦?à¦¿-à¦à¦¾à¦?à¦°à¦¾à¦¸/à¦?à¦¨à§?à¦?à¦¿ à¦®à§?à¦¯à¦¾à¦²à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦° à¦¸à¦«à¦?à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦°à§?à¦° à¦?à¦¨à§?à¦¯ à¦?à¦? à¦§à¦°à¦¨à§?à¦° à¦?à¦¸à§?à¦¯à§? à¥¤"
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -2699,7 +2716,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2760,7 +2777,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4111,8 +4128,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4677,7 +4694,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7838,7 +7855,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7929,14 +7946,10 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
-"à¦?à¦®à¦¾à¦¦à§?à¦° à¦?à¦°à§?à¦¥à¦¿à¦? à¦ªà§?à¦°à¦¤à¦¿à¦¬à§?à¦¦à¦¨à¦?à§?à¦²à¦¿à¦¤à§? à¦?à¦®à¦¾à¦¦à§?à¦° à¦¸à¦®à¦¸à§?à¦¤ "
-"[à¦¸à§?à¦ªà¦¨à¦¸à¦°](https://www.torproject.org/about/sponsors.html.en) à¦?à¦¬à¦? [à¦¬à§?à¦²à¦? "
-"à¦ªà§?à¦¸à§?à¦?à¦?à§?à¦²à¦¿à¦°](https://blog.torproject.org/category/tags/form-990)  à¦?à¦?à¦?à¦¿ à¦¤à¦¾à¦²à¦¿à¦?à¦¾"
-" à¦¦à§?à¦?à§?à¦¨à¥¤"
 
 #: https//support.torproject.org/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -8653,8 +8666,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "à¦?à¦°à§?à¦¥ à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à§?à¦¨, à¦?à¦¬à¦? à¦®à¦?à¦¿à¦²à¦¾ à¦¸à¦®à¦ªà¦°à¦¿à¦®à¦¾à¦£ à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à¦¬à§?à¥¤ "
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨"
 
diff --git a/contents+ca.po b/contents+ca.po
index 229fcce22..e5b461cd4 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -1053,8 +1053,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1122,8 +1122,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1329,16 +1329,20 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
+"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1349,9 +1353,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
+"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1377,6 +1383,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1402,6 +1418,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2685,14 +2706,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"Si esteu executant un antivirus, consulteu <mark><a "
-"href=\"http://support.torproject.org/#tbb-10\";>La meva protecciÃ³ "
-"antivirus/malware no em permet accedir al navegador Tor</a></mark>, Ã©s "
-"habitual que el programari antivirus o antimalware produeixi aquest tipus de"
-" problema."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -2838,7 +2854,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2899,7 +2915,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4256,8 +4272,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4822,7 +4838,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7998,10 +8014,8 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"BitTorrent en concret [no Ã©s anÃ²nim sobre Tor](https://blog.torproject.org";
-"/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -8092,15 +8106,10 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
-"Consulteu una llista de tots els <mark><a "
-"href=\"https://www.torproject.org/about/sponsors.html.en\";>nostres "
-"patrocinadors</a></mark><mark><a "
-"href=\"https://blog.torproject.org/category/tags/form-990\";> i una sÃ¨rie de "
-"publicacions</a></mark> sobre els nostres informes financers."
 
 #: https//support.torproject.org/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -8816,8 +8825,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "DÃ³na avui, i Mozilla donarÃ  el mateix import."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Baixeu el navegador Tor"
 
diff --git a/contents+cs.po b/contents+cs.po
index aaaedd0dd..7b8f5fefe 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
@@ -916,8 +916,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -983,8 +983,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1189,14 +1189,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1209,7 +1209,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1237,6 +1237,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1259,6 +1269,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2393,8 +2408,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2541,7 +2556,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2602,7 +2617,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3815,8 +3830,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4381,7 +4396,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7484,7 +7499,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7561,9 +7576,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8245,8 +8260,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "PÅ?ispÄ?jte hned a Mozilla vÃ¡s dar zdvojnÃ¡sobÃ."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "StÃ¡hnout prohlÃÅ¾eÄ? Tor"
 
diff --git a/contents+da.po b/contents+da.po
index f0f190427..31470cc84 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-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: scootergrisen, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -892,8 +892,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -959,8 +959,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1165,14 +1165,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1213,6 +1213,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1235,6 +1245,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2318,8 +2333,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2466,7 +2481,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2527,7 +2542,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3742,8 +3757,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4308,7 +4323,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7411,7 +7426,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7488,9 +7503,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8172,8 +8187,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Giv i dag, og Mozilla vil matche din donation."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
 
diff --git a/contents+de.po b/contents+de.po
index d606feea7..aa62bd1ea 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -943,8 +943,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1021,8 +1021,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1267,16 +1267,20 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
+"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1288,9 +1292,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
+"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1318,6 +1324,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1343,6 +1359,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2015,6 +2036,8 @@ msgid ""
 "[DuckDuckGo](https://duckduckgo.com/) is the default search engine in Tor "
 "Browser."
 msgstr ""
+"<mark><a href=\"https://duckduckgo.com/\";>DuckDuckGo</a></mark> ist die "
+"Standard-Suchmaschine in Tor Browser."
 
 #: https//support.torproject.org/tbb/tbb-23/
 #: (content/tbb/tbb-23/contents+en.lrquestion.description)
@@ -2023,6 +2046,10 @@ msgid ""
 "searches. Learn more about [DuckDuckGo privacy "
 "policy](https://duckduckgo.com/privacy)."
 msgstr ""
+"DuckDuckGo verwendet keine Tracker und speichert keine Daten Ã¼ber Suchen. "
+"Erfahre mehr Ã¼ber die <mark><a "
+"href=\"https://duckduckgo.com/privacy\";>Datenschutzrichtlinie von "
+"DuckDuckGo</a></mark>."
 
 #: https//support.torproject.org/tbb/tbb-24/
 #: (content/tbb/tbb-24/contents+en.lrquestion.title)
@@ -2044,6 +2071,9 @@ msgid ""
 "If you believe this is a Tor Browser issue, please report it on our [bug "
 "tracker](https://trac.torproject.org/)."
 msgstr ""
+"Wenn du das fÃ¼r einen Fehler in Tor Browser hÃ¤ltst, erstelle bitte einen "
+"Bericht in unserer <mark><a href=\"https://trac.torproject.org/\";>Fehler-"
+"Datenbank</a></mark>."
 
 #: https//support.torproject.org/tbb/tbb-25/
 #: (content/tbb/tbb-25/contents+en.lrquestion.title)
@@ -2054,6 +2084,8 @@ msgstr "Ich habe Schwierigkeiten mit NoScript."
 #: (content/tbb/tbb-25/contents+en.lrquestion.description)
 msgid "Please see the [NoScript FAQ](https://noscript.net/faq)."
 msgstr ""
+"Siehe <mark><a href=\"https://noscript.net/faq\";>HÃ¤ufig gestellte Fragen zu "
+"NoScript</a></mark>."
 
 #: https//support.torproject.org/tbb/tbb-26/
 #: (content/tbb/tbb-26/contents+en.lrquestion.title)
@@ -2066,6 +2098,8 @@ msgid ""
 "Please see the [HTTPS Everywhere FAQ](https://www.eff.org/https-";
 "everywhere/faq)."
 msgstr ""
+"Siehe <mark><a href=\"https://www.eff.org/https-everywhere/faq\";>HÃ¤ufig "
+"gestellte Fragen zu HTTPS Everywhere</a></mark>."
 
 #: https//support.torproject.org/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.title)
@@ -2309,6 +2343,9 @@ msgid ""
 "If you'd like to become a relay, please see our [Tor Relay "
 "Guide](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide)."
 msgstr ""
+"Um ein Relay zu betreiben, siehe unsere <mark><a "
+"href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\";>Relay-"
+"Anleitung</a></mark>."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
@@ -2421,6 +2458,11 @@ msgid ""
 "translator!](https://community.torproject.org/localization/becoming-tor-";
 "translator/)"
 msgstr ""
+"Wir mÃ¶chten, dass jeder Tor-Browser in seiner eigenen Sprache nutzen kann. "
+"Tor-Browser ist jetzt [in 32 verschiedenen Sprachen verfÃ¼gbar] "
+"(https://www.torproject.org/download/languages/), und wir arbeiten daran, "
+"weitere hinzuzufÃ¼gen. MÃ¶chtest du uns bei der Ã?bersetzung helfen? [Siehe "
+"hier](https://tb-manual.torproject.org/becoming-tor-translator/)"
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
@@ -2429,6 +2471,9 @@ msgid ""
 "installing and testing [Tor Browser Alpha "
 "releases](https://www.torproject.org/download/alpha/)."
 msgstr ""
+"Du kannst uns auch helfen, die nÃ¤chsten Sprachen zu testen, die wir "
+"verÃ¶ffentlichen werden, indem du [Tor Browser Alpha VerÃ¶ffentlichungen] "
+"(https://www.torproject.org/download/alpha/) installierst und testest."
 
 #: https//support.torproject.org/tbb/tbb-38/
 #: (content/tbb/tbb-38/contents+en.lrquestion.title)
@@ -2544,6 +2589,10 @@ msgid ""
 "Browser](https://www.torproject.org/projects/torbrowser/design/#identifier-";
 "linkability) document further explains the thinking behind this design."
 msgstr ""
+"Das Dokument <mark><a "
+"href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-";
+"linkability\">Entwurf und Umsetzung von Tor Browser</a></mark> erklÃ¤rt die "
+"Idee dahinter ausfÃ¼hrlicher."
 
 #: https//support.torproject.org/tbb/tbb-41/
 #: (content/tbb/tbb-41/contents+en.lrquestion.title)
@@ -2590,6 +2639,9 @@ msgid ""
 "Tor Browser is built using [Firefox ESR](https://www.mozilla.org/en-";
 "US/firefox/organizations/), so errors regarding Firefox may occur."
 msgstr ""
+"Tor Browser baut auf <mark><a href=\"https://www.mozilla.org/en-";
+"US/firefox/organizations/\">Firefox ESR</a></mark> auf, Probleme von Firefox"
+" kÃ¶nnen also auftreten."
 
 #: https//support.torproject.org/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)
@@ -2607,8 +2659,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2755,7 +2807,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2816,7 +2868,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4187,8 +4239,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4753,7 +4805,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8301,7 +8353,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8391,9 +8443,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9105,8 +9157,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Gib noch heute, und Mozilla wird deiner Spende entsprechen."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tor Browser herunterladen"
 
diff --git a/contents+el.po b/contents+el.po
index a5fc2c22e..233fb8fa2 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -932,8 +932,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -999,8 +999,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1205,14 +1205,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1253,6 +1253,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1275,6 +1285,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2529,8 +2544,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2677,7 +2692,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2738,7 +2753,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4096,8 +4111,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4662,7 +4677,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7805,10 +7820,8 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"Î¤Î¿ BitTorrent Ï?Ï?Î³ÎºÎµÎºÏ?Î¹Î¼ÎÎ½Î± [Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Ï?Î½Ï?Î¼Î¿ Î¼ÎÏ?Ï? Ï?Î¿Ï? "
-"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -7896,14 +7909,10 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
-"Î?ÎµÎ¯Ï?Îµ Ï?Î· Î»Î¯Ï?Ï?Î± Î¼Îµ Ï?Î»Î¿Ï?Ï? Ï?Î¿Ï?Ï? [Ï?Î¿Ï?Î·Î³Î¿Ï?Ï? "
-"Î¼Î±Ï?](https://www.torproject.org/about/sponsors.html.en) ÎºÎ±Î¹ Î¼Î¹Î± Ï?ÎµÎ¹Ï?Î¬ Î±Ï?Ï? "
-"[Î´Î·Î¼Î¿Ï?Î¹ÎµÏ?Ï?ÎµÎ¹Ï? blog](https://blog.torproject.org/category/tags/form-990) Î³Î¹Î± "
-"Ï?Î¹Ï? Î´Î·Î»Ï?Ï?ÎµÎ¹Ï? Ï?Ï?Î½ Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏ?Î½ Î¼Î±Ï?."
 
 #: https//support.torproject.org/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -8606,8 +8615,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Î?Ï?Ï?Î¯Ï?Ï?Îµ Ï?Î®Î¼ÎµÏ?Î± ÎºÎ±Î¹ Ï?Î¿ Mozilla Î¸Î± Î´Ï?Ï?Î¯Ï?ÎµÎ¹ Ï?Î¿ Î¯Î´Î¹Î¿ Ï?Î¿Ï?Ï?!"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ Tor Browser"
 
diff --git a/contents+es-AR.po b/contents+es-AR.po
index a58904e45..470d3cba6 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -912,8 +912,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -979,8 +979,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1185,14 +1185,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1205,7 +1205,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1233,6 +1233,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1255,6 +1265,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2499,8 +2514,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2647,7 +2662,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2708,7 +2723,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4076,8 +4091,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4642,7 +4657,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8105,7 +8120,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8195,9 +8210,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8904,8 +8919,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "DÃ¡ hoy, y Mozilla emparejarÃ¡ tu donaciÃ³n."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Descargar el Navegador Tor"
 
diff --git a/contents+es.po b/contents+es.po
index dcd62813f..ffc43ec4d 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -2,16 +2,16 @@
 # Zuhualime Akoochimoya, 2019
 # strel, 2019
 # David Figuera <dfb@xxxxxxxxxxxx>, 2019
-# erinm, 2019
 # eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2019
 # Nicolas Sera-Leyva <nseraleyva@xxxxxxxxxxxxx>, 2019
+# erinm, 2019
 # Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -1076,12 +1076,9 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
-"A pesar de que el enrutado en cebolla se ha convertido en un tÃ©rmino de uso "
-"interno, Tor naciÃ³ del [proyecto de enrutado cebolla](http://www.onion-";
-"router.net/) del laboratorio de investigaciÃ³n de la marina."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1160,9 +1157,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
+"Por ejemplo, `torbrowser-install-win64-9.0_es-ES.exe` estÃ¡ acompaÃ±ado por "
+"`torbrowser-install-win64-9.0_es-ES.exe.asc`."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1403,19 +1402,19 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1429,10 +1428,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1461,6 +1460,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1486,6 +1495,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2791,8 +2805,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2972,7 +2986,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -3045,7 +3059,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4528,8 +4542,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -5095,7 +5109,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8698,10 +8712,8 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
-msgstr ""
-"EspecÃficamente [BitTorrent â??no es anÃ³nimo sobre "
 "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
+msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -8791,9 +8803,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9593,8 +9605,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Dona hoy, y Mozilla igualarÃ¡ tu donaciÃ³n."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Bajarse el Navegador Tor"
 
diff --git a/contents+fa.po b/contents+fa.po
index 2e46302b0..e4890d754 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Reza Ghasemi, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
@@ -924,8 +924,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -993,8 +993,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1199,14 +1199,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1219,7 +1219,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1247,6 +1247,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1269,6 +1279,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2384,8 +2399,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2532,7 +2547,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2593,7 +2608,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3830,8 +3845,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4396,7 +4411,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7502,7 +7517,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7579,9 +7594,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8263,8 +8278,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Ø§Ù?Ø±Ù?Ø² Ú©Ù?Ú© Ú©Ù?Û?Ø¯ Ù? Ù?Ù?Ø²Û?Ù?Ø§ Ø¨Ø§ Ú©Ù?Ú© Ù?Ø§Ù?Û? Ø´Ù?Ø§ Ù?Ù?Ø±Ø§Ù?Û? Ù?Û?â??Ú©Ù?Ø¯."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Ø¨Ø§Ø±Ú¯Û?Ø±Û? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±"
 
diff --git a/contents+fo.po b/contents+fo.po
index 16ef306e1..7b4d08a65 100644
--- a/contents+fo.po
+++ b/contents+fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n"
@@ -906,8 +906,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -973,8 +973,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1179,14 +1179,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1227,6 +1227,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1249,6 +1259,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2368,8 +2383,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2516,7 +2531,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2577,7 +2592,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3792,8 +3807,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4358,7 +4373,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7461,7 +7476,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7539,9 +7554,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8226,8 +8241,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tak niÃ°ur Tor kagarin."
 
diff --git a/contents+fr.po b/contents+fr.po
index 4e3b93271..eabff73fc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2,19 +2,19 @@
 # Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2019
 # David Georges, 2019
 # N W, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # PoorPockets McNewHold <poorpocketsmcnewhold@xxxxxxxxxxxxx>, 2019
 # AO <ao@xxxxxxxxxxxxxxxxxxx>, 2019
 # Adam Lynn <adam@xxxxxxxxxxxxxxxx>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: Adam Lynn <adam@xxxxxxxxxxxxxxxx>, 2019\n"
+"Last-Translator: erinm, 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"
@@ -943,8 +943,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1021,8 +1021,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1269,14 +1269,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1291,7 +1291,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1322,6 +1322,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1344,6 +1354,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2643,8 +2658,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2791,7 +2806,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2852,7 +2867,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4247,8 +4262,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4813,7 +4828,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8379,7 +8394,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8473,9 +8488,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9189,8 +9204,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Faites un don aujourdâ??hui et Mozilla fera un don Ã©quivalent."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "TÃ©lÃ©charger le NavigateurÂ Tor"
 
diff --git a/contents+ga.po b/contents+ga.po
index 3efa49225..8c61ccde6 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-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -908,8 +908,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -975,8 +975,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1181,14 +1181,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1201,7 +1201,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1229,6 +1229,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1251,6 +1261,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2504,8 +2519,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2652,7 +2667,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2713,7 +2728,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4079,8 +4094,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4645,7 +4660,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7801,7 +7816,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7890,9 +7905,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8598,8 +8613,8 @@ msgstr ""
 "dÃºinn."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Ã?oslÃ³dÃ¡il BrabhsÃ¡laÃ Tor"
 
diff --git a/contents+gu.po b/contents+gu.po
index 6e03cd3b3..e33f5231b 100644
--- a/contents+gu.po
+++ b/contents+gu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n"
@@ -894,8 +894,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -961,8 +961,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1167,14 +1167,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1187,7 +1187,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1215,6 +1215,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1237,6 +1247,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2318,8 +2333,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2466,7 +2481,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2527,7 +2542,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3740,8 +3755,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4306,7 +4321,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7409,7 +7424,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7486,9 +7501,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8170,8 +8185,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr ""
 
diff --git a/contents+he.po b/contents+he.po
index 08f879985..5a7554ff2 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: ION, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -897,8 +897,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -964,8 +964,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1170,14 +1170,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1218,6 +1218,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1240,6 +1250,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2337,8 +2352,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2485,7 +2500,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2546,7 +2561,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3768,8 +3783,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4334,7 +4349,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7437,7 +7452,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7514,9 +7529,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8198,8 +8213,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "×ª×? ×?×?×?×?, ×?Ö¾Mozilla ×ª×©×?×?×? ×?×ª ×ª×¨×?×?×ª×?."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "×?×?×¨×? ×?×ª ×?×¤×?×¤×? Tor"
 
diff --git a/contents+hi.po b/contents+hi.po
index acca8b683..23bb069a6 100644
--- a/contents+hi.po
+++ b/contents+hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n"
@@ -892,8 +892,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -959,8 +959,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1165,14 +1165,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1213,6 +1213,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1235,6 +1245,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2316,8 +2331,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2464,7 +2479,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2525,7 +2540,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3738,8 +3753,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4304,7 +4319,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7407,7 +7422,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7484,9 +7499,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8168,8 +8183,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr ""
 
diff --git a/contents+hu.po b/contents+hu.po
index 950d48064..1dd93ba13 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
@@ -904,8 +904,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -971,8 +971,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1177,14 +1177,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1197,7 +1197,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1225,6 +1225,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1247,6 +1257,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2333,8 +2348,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2481,7 +2496,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2542,7 +2557,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3787,8 +3802,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4353,7 +4368,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7458,7 +7473,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7535,9 +7550,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8219,8 +8234,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Adjon ma Ã©s a Mozilla is annyival tÃ¡mogat."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tor Browser letÃ¶ltÃ©se"
 
diff --git a/contents+id.po b/contents+id.po
index 55377ad94..c60afea6d 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -920,8 +920,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -987,8 +987,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1194,16 +1194,20 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
+"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1214,9 +1218,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
+"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1242,6 +1248,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1267,6 +1283,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2525,8 +2546,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2673,7 +2694,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2734,7 +2755,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4089,8 +4110,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4655,7 +4676,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7818,7 +7839,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7910,9 +7931,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8622,8 +8643,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Unduh Tor Browser"
 
diff --git a/contents+is.po b/contents+is.po
index 37eb63015..d309fbc30 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2019\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
@@ -918,8 +918,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -994,8 +994,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1213,14 +1213,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1233,7 +1233,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1261,6 +1261,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1283,6 +1293,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2541,8 +2556,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2689,7 +2704,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2750,7 +2765,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4126,8 +4141,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4692,7 +4707,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8216,7 +8231,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8309,9 +8324,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9021,8 +9036,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "GefÃ°u Ã dag - og Mozilla mun jafna framlag Ã¾itt."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "SÃ¦ktu Tor-vafrann"
 
diff --git a/contents+it.po b/contents+it.po
index e217a4de1..8eef9f9e3 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
@@ -1081,8 +1081,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1164,11 +1164,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
-"Per esempio, `torbrowser-install-win64-9.0.1_en-US.exe` Ã¨ accompagnato da "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1408,19 +1406,19 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1433,10 +1431,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1465,6 +1463,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr "#### Soluzione alternativa (utilizzando una chiave pubblica)"
 
@@ -1494,6 +1502,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2867,13 +2880,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"Se stai utilizzando un anti-virus, per favore guarda [Il mio "
-"antivirus/protezione malware mi blocca dall'accedere a Tor "
-"Browser](http://support.torproject.org/#tbb-10), Ã¨ comune che software anti-"
-"virus/anti-malware causino questo tipo di problemi."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -3072,11 +3081,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
-"In pratica, sfortunatamente, Ã¨ [molto piÃ¹ complesso di cosÃ¬] "
-"(http://fscked.org/blog/fully-automated-active-https-cookie-hijacking)."
 
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
@@ -3147,7 +3154,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4659,11 +4666,9 @@ msgstr "Sono dietro un NAT/Firewall."
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
-"Consulta [portforward.com](http://portforward.com/) per istruzioni su come "
-"fare port forward con il tuo dispositivo NAT/router."
 
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
@@ -5369,12 +5374,8 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
-"Scopri ulteriori dettagli in questo [blog "
-"post](https://blog.torproject.org/blog/lifecycle-of-a-new-relay) o in "
-"[Changing of the Guards: A Framework for Understanding and Improving Entry "
-"Guard Selection in Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.title)
@@ -9115,7 +9116,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -9206,9 +9207,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9920,8 +9921,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Dai oggi, e Mozilla ricambierÃ  la tua donazione."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Scarica Tor Browser"
 
diff --git a/contents+ja.po b/contents+ja.po
index be1917385..5c912973b 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: ue zaeco, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -897,8 +897,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -964,8 +964,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1170,14 +1170,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1218,6 +1218,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1240,6 +1250,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2324,8 +2339,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2472,7 +2487,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2533,7 +2548,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3747,8 +3762,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4313,7 +4328,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7420,7 +7435,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7497,9 +7512,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8181,8 +8196,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "å¯?ä»?ã??ã??é¡?ã??ã??ã?¾ã??ã??Mozillaã?¯ã??ã?ªã??ã?®å¯?ä»?ã?«è£?å??ã??ã?¾ã??ã??ã??"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tor Browser ã??ã??ã?¦ã?³ã?ã?¼ã??"
 
diff --git a/contents+ka.po b/contents+ka.po
index df2bfde98..8c7d4ab82 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-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Georgianization, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -1076,12 +1076,9 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
-"á??á??á? á??á??á??á??á??, onion-á??á??á??á??á?¡á??á??á??á? á??á??á??á?? á??á?¥á?ªá?? á??á??á?¡á??á?®á??á??á??á??á??á?? á?¨á??á??á?? á??á??á??á??á?§á??á??á??á??á??á?¡, Tor á??á??á?©á??á??á?? "
-"[onion-á??á??á??á??á?¡á??á??á??á? á??á??á??á??á?¡ á??á? á??á??á?¥á?¢á??á?¡á??á??á??](http://www.onion-router.net/), á? á??á??á??á??á??á?ª "
-"á??á??á??á?¨á??á?? á?¡á??á??á?¦á??á??á?? á??á??á??á??á??á??á?? á??á??á??á??á? á??á?¢á??á? á??á??á?¨á??."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1160,11 +1157,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
-"á??á??á??á??á??á??á??á??á??, â??torbrowser-install-win64-9.0.1_en-US.exeâ?? á?¤á??á??á??á?¡ á??á??á?? á??á?®á??á??á??á?¡ á?¤á??á??á??á??"
-" â??torbrowser-install-win64-9.0.1_en-US.exe.ascâ??."
+"á??á??á??á??á??á??á??á??á??, â??torbrowser-install-win64-9.0_en-US.exeâ?? á?¤á??á??á??á?¡ á??á??á?? á??á?®á??á??á??á?¡ á?¤á??á??á??á?? "
+"â??torbrowser-install-win64-9.0_en-US.exe.ascâ??."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1402,19 +1399,19 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1428,10 +1425,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1460,6 +1457,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr "#### á??á? á??á??á??á??á??á?? á??á??á??á??á?¡á??á??á??á??á?? (á?¡á??á?¯á??á? á?? á??á??á?¡á??á?¦á??á??á??á??)"
 
@@ -1490,6 +1497,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2848,13 +2860,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"á??á?£ á??á?§á??á??á??á??á?? á??á??á?¢á??á??á??á? á?£á?¡á?¡, á??á??á?®á??á??á?? á??á?®á??á??á??á?? [á?©á??á??á?? á??á??á?¢á??á??á??á? á?£á?¡á?? á??á?? á??á??á??á??á?? "
-"á??á? á??á??á? á??á??á??á??á??á?¡á??á??á?? á??á??á?ªá??á?? á??á??á??á?¦á?£á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á??á?? "
-"á?¬á??á??á??á??á??á?¡](http://support.torproject.org/#tbb-10), á?®á?¨á??á? á?? á?¨á??á??á??á?®á??á??á??á??á??, á? á??á?ªá?? "
-"á??á??á?¢á??á??á??á? á?£á?¡á?? á??á?? á??á??á??á??á?? á??á? á??á??á? á??á??á??á??á??á?¡á??á??á?? á??á??á?ªá??á?? á??á?¬á??á??á??á?¡ á??á?? á?®á??á? á??á??á??á?¡."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -3048,11 +3056,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
-"á??á? á??á?¥á?¢á??á??á?£á??á??á?? á??á?? á??á??á??, á? á??á?? [á?£á?¤á? á?? á? á??á?£á??á??á??á??á?? á?¡á??á?¥á??á??](http://fscked.org/blog/fully-";
-"automated-active-https-cookie-hijacking)."
 
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
@@ -3133,13 +3139,8 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
-"á??á??á? á??á??á??á??, á??á??á??á??á?®á??á??á??á?? HTTPProxyAuthenticator á??á?? HTTPSProxyAuthenticator "
-"á??á??á? á??á??á??á?¢á? á??á??á?¡, á??á?£ á??á?¥á??á??á??á?? á??á? á??á?¥á?¡á?? á?¡á??á?á??á? á??á??á??á?¡ á??á??á??á??á? á??á?¨á??á?? á?¨á??á?¡á??á??á??á?¡. á?©á??á??á??á??á??á??, "
-"á??á?®á??á? á??á??á?á??á? á??á??á??á?? á??á?®á??á??á??á?? á??á??á? á?¢á??á??á?? á?¨á??á?¡á??á??á??á?¡ á?¨á??á?¡á??á?«á??á??á??á??á??á??á??, á??á??á??á? á??á?? á??á?£ NTLM-á??á??á??á??á?¬á??á??á??á?? "
-"á??á??á?¡á??á?á??á? á??á??á??á??á??, á?¨á??á??á?«á??á??á??á?? á??á??á??á??á??á??á??á??á??á?? [á??á?¡ á??á??á?¡á?¢á?? "
-"á??á? á?¥á??á??á??á??á??á??](http://archives.seul.org/or/talk/Jun-2005/msg00223.html)."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)
@@ -4666,11 +4667,9 @@ msgstr "á??á?§á??á??á??á?? NAT/á?¥á?¡á??á??á??á?¡ á?¤á??á? á??."
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
-"á??á?®á??á??á??á?? [portforward.com](http://portforward.com/) á??á??á??á??á??á??á??á??á??á??á?¡á??á??á??á?¡, á??á?£ á? á??á??á??á?  "
-"á?£á??á??á?? á??á??á??á??á??á??á?¡á??á??á??á? á??á??á??á?¡ á??á??á? á?¢á??á??á?? NAT/á? á??á?£á?¢á??á? á??á?¡ á??á??á??á??á?§á??á??á??á??á??á?¡á??á?¡."
 
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
@@ -5388,12 +5387,8 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
-"á??á? á?ªá??á??á??, á??á?®á??á??á??á?? á??á?¡ [á?¡á??á??á?¢á??](https://blog.torproject.org/blog/lifecycle-of-a";
-"-new-relay) á??á?? [á??á?ªá??á??á??á??á??á??á?¡ á?¨á??á?ªá??á??á??: á?¨á??á??á??á??á??á??á?? á??á?ªá??á??á??á??á?¡ á?¨á??á? á?©á??á??á??á?¡ á?¡á?¥á??á??á?? Tor-á?¨á??, "
-"á?£á??á??á?? á??á??á??á??á??á??á?¡á?? á??á?? "
-"á??á??á?£á??á?¯á??á??á??á?¡á??á??á??á?¡á??á??á??á?¡](http://freehaven.net/anonbib/#wpes12-cogs)."
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.title)
@@ -9293,10 +9288,8 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"BitTorrent á??á??á??á??á??á??á?? á??á??á?  á?£á??á? á?£á??á??á??á??á?§á??á?¤á?¡ [á??á??á??á??á??á??á??á?¡ á??á??á?£á??á?®á??á??á??á??á??á?¡ Tor-"
-"á??á??.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -9388,15 +9381,10 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
-"á??á?®á??á??á??á?? á?§á??á??á??á?? [á?©á??á??á??á?? á?¤á??á??á??á??á?¡á?£á? á?? "
-"á??á?®á??á? á??á??á??á?á??á? á??](https://www.torproject.org/about/sponsors.html.en) á??á?? "
-"[á?¡á?¢á??á?¢á??á??á??á??á?¡ á?¡á??á? á??á??á?¡ "
-"á?¡á??á??á?¢á??á??](https://blog.torproject.org/category/tags/form-990) á?©á??á??á??á?? "
-"á?®á??á? á?¯á??á??á?¦á? á??á?ªá?®á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á??."
 
 #: https//support.torproject.org/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -10191,8 +10179,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "á??á??á??á?ªá??á?? á??á?¦á??á?¡á??á?? á??á?? Mozilla á??á??á??á??á? á??á??á??á??á??á?¡ á??á?¥á??á??á??á?¡ á?¨á??á??á??á?¬á??á? á?£á??á??á??á??á?¡."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? Tor-á??á? á??á?£á??á??á? á??"
 
diff --git a/contents+ko.po b/contents+ko.po
index b195f3406..c1b18c456 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Johnny Cho <popeye92@xxxxxxxxx>, 2019\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -897,8 +897,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -964,8 +964,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1170,14 +1170,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1218,6 +1218,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1240,6 +1250,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2330,8 +2345,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2478,7 +2493,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2539,7 +2554,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3761,8 +3776,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4327,7 +4342,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7432,7 +7447,7 @@ msgstr "ë§?ì?? ì¶?êµ¬ ë?¸ë??ë?? BitTorrentì?? ê°?ì?? í?¹ì ? ì? í??ì?? í??ì?¼ ê³µ
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7511,9 +7526,9 @@ msgstr "Torë?? ë¯¸êµ ì?°ë°© ì ?ë¶? ê¸°ê´?, ì?¬ì?¤ ì?¬ë?¨ ë°? ê°?ì?¸ ê¸°ë¶?ì??
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8195,8 +8210,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??"
 
diff --git a/contents+mk.po b/contents+mk.po
index a45441236..3bcbf6957 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 2019\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
@@ -896,8 +896,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -963,8 +963,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1169,14 +1169,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1189,7 +1189,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1217,6 +1217,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1239,6 +1249,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2320,8 +2335,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2468,7 +2483,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2529,7 +2544,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3742,8 +3757,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4308,7 +4323,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7416,7 +7431,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7493,9 +7508,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8177,8 +8192,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Ð?Ð¾Ð½Ð¸Ñ?Ð°Ñ? Ð´ÐµÐ½ÐµÑ?, Ð¸ Mozilla Ñ?Ðµ Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ð·Ðµ Ð?Ð°Ñ?Ð°Ñ?Ð° Ð´Ð¾Ð½Ð°Ñ?Ð¸Ñ?Ð°."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Ð?Ñ?ÐµÐ²Ð·ÐµÐ¼Ð¸ Tor Ð?Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?"
 
diff --git a/contents+ml.po b/contents+ml.po
index d174d0bf8..a8954d3aa 100644
--- a/contents+ml.po
+++ b/contents+ml.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
@@ -1093,12 +1093,9 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
-"à´?à´£à´¿à´¯àµ» à´±àµ?à´?àµ?à´?à´¿à´?à´?àµ? à´?à´°àµ? à´¸à´¾à´§à´¾à´°à´£ à´?à´¾àµ¼à´¹à´¿à´? à´ªà´¦à´®à´¾à´¯à´¿ à´®à´¾à´±à´¿à´¯àµ?à´?àµ?à´?à´¿à´²àµ?à´?, à´¨àµ?à´µàµ½ à´±à´¿à´¸àµ¼à´?àµ?à´?àµ? à´²à´¾à´¬àµ? "
-"à´¨à´?à´¤àµ?à´¤àµ?à´¨àµ?à´¨ à´¯à´¥à´¾àµ¼à´¤àµ?à´¥ [à´?à´£à´¿à´¯àµ» à´±àµ?à´?àµ?à´?à´¿à´?à´?àµ? à´ªàµ?à´°àµ?à´?à´?àµ?à´±àµ?à´±àµ?](http://www.onion-";
-"router.net/) àµ½ à´¨à´¿à´¨àµ?à´¨à´¾à´£àµ? à´?àµ?àµ¼ à´?à´¨à´¿à´?àµ?à´?à´¤àµ?."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1177,11 +1174,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
-"à´?à´¦à´¾à´¹à´°à´£à´¤àµ?à´¤à´¿à´¨àµ?, `torbrowser-install-win64-9.0.1_en-US.exe` à´?à´¨àµ?à´¨à´¤à´¿à´¨àµ?à´ªàµ?à´ªà´?` "
-"torbrowser-install-win64-9.0.1_en-US.exe.asc`."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1426,20 +1421,16 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
-"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1452,11 +1443,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
-"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1484,6 +1473,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr "#### Workaround (à´?à´°àµ? à´ªàµ?à´¤àµ? à´?àµ? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ?)"
 
@@ -1513,6 +1512,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2923,13 +2927,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"à´¨à´¿à´?àµ?à´?àµ¾ à´?à´°àµ? à´?à´¨àµ?à´±à´¿ à´µàµ?à´±à´¸àµ? à´ªàµ?à´°à´µàµ¼à´¤àµ?à´¤à´¿à´ªàµ?à´ªà´¿à´?àµ?à´?àµ?à´?à´¯à´¾à´£àµ?à´?àµ?à´?à´¿àµ½, à´¦à´¯à´µà´¾à´¯à´¿ à´?à´¾à´£àµ?à´? [à´?à´¨àµ?à´±àµ? "
-"à´?à´¨àµ?à´±à´¿à´µàµ?à´±à´¸àµ? / à´?àµ?à´·àµ?à´¦àµ?à´°à´µàµ?à´¯àµ¼ à´ªà´°à´¿à´°à´?àµ?à´·à´£à´? à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´?à´?àµ?à´¸à´¸àµ? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨à´¤à´¿àµ½ à´¨à´¿à´¨àµ?à´¨àµ? "
-"à´?à´¨àµ?à´¨àµ? à´¤à´?à´¯àµ?à´¨àµ?à´¨àµ?](http://support.torproject.org/#tbb-10), à´?à´¤àµ? à´?à´¨àµ?à´±à´¿ à´µàµ?à´±à´¸àµ? / "
-"à´?à´¤àµ?à´¤à´°à´¤àµ?à´¤à´¿à´²àµ?à´³àµ?à´³ à´ªàµ?à´°à´¶àµ?â??à´¨à´®àµ?à´£àµ?à´?à´¾à´?àµ?à´?à´¾àµ» à´?à´¨àµ?à´±à´¿-à´®à´¾àµ½à´µàµ?à´¯àµ¼ à´¸àµ?à´«àµ?à´±àµ?à´±àµ?à´µàµ?à´¯àµ¼."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -3131,11 +3131,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
-"à´ªàµ?à´°à´¾à´¯àµ?à´?à´¿à´?à´®à´¾à´¯à´¿, à´?à´¯àµ?à´¯àµ?, à´?à´¤àµ? [à´?à´¤à´¿à´¨àµ?à´?àµ?à´?à´¾àµ¾ à´¸à´?àµ?à´?àµ?àµ¼à´£àµ?à´£à´®à´¾à´¯ "
-"à´µà´´à´¿](http://fscked.org/blog/fully-automated-active-https-cookie-hijacking)."
 
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
@@ -3221,14 +3219,8 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
-"à´?àµ?à´?à´¾à´¤àµ?, à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´ªàµ?à´°àµ?à´?àµ?à´¸à´¿à´?àµ?à´?àµ? à´ªàµ?à´°à´¾à´®à´¾à´£àµ?à´?à´°à´£à´? à´?à´µà´¶àµ?à´¯à´®àµ?à´?àµ?à´?à´¿àµ½ "
-"HTTPProxyAuthenticator, HTTPSProxyAuthenticator à´?à´ªàµ?à´·à´¨àµ?à´?àµ¾ à´µà´¾à´¯à´¿à´?àµ?à´?àµ?à´?. à´?à´?àµ?à´?àµ¾ "
-"à´¨à´¿à´²à´µà´¿àµ½ à´?à´?à´¿à´¸àµ?à´¥à´¾à´¨ à´ªàµ?à´°à´¾à´®à´¾à´£àµ?à´?à´°à´£à´¤àµ?à´¤àµ? à´®à´¾à´¤àµ?à´°à´®àµ? à´ªà´¿à´¨àµ?à´¤àµ?à´£à´¯àµ?à´?àµ?à´?àµ?, à´ªà´?àµ?à´·àµ? à´¨à´¿à´?àµ?à´?àµ¾à´?àµ?à´?àµ? "
-"à´?àµ»â??à´?à´¿â??à´?àµ½â??à´?à´? à´ªàµ?à´°à´¾à´®à´¾à´£àµ?à´?à´°à´£à´? à´?à´µà´¶àµ?à´¯à´®àµ?à´£àµ?à´?àµ?à´?àµ?à´?à´¿àµ½, [à´?àµ¼à´?àµ?à´?àµ?à´µàµ?à´?à´³à´¿à´²àµ? à´? "
-"à´?àµ?à´±à´¿à´ªàµ?à´ªàµ?](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) "
-"à´?à´ªà´¯àµ?à´?à´ªàµ?à´°à´¦à´®à´¾à´?àµ?à´?."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)
@@ -4774,11 +4766,9 @@ msgstr "à´?à´¾àµ» à´?à´°àµ? NAT / Firewall à´¨àµ? à´ªà´¿à´¨àµ?à´¨à´¿à´²à´¾à´£àµ?
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
-"à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? NAT / à´±àµ?à´?àµ?à´?àµ¼ à´?à´ªà´?à´°à´£à´? à´?à´ªà´¯àµ?à´?à´¿à´?àµ?à´?àµ? à´?à´?àµ?à´?à´¨àµ? à´®àµ?à´¨àµ?à´¨àµ?à´?àµ?à´?àµ? à´ªàµ?à´?à´¾à´®àµ?à´¨àµ?à´¨à´¤à´¿à´¨àµ?à´³àµ?à´³ "
-"à´¨à´¿àµ¼à´¦àµ?à´¦àµ?à´¶à´?àµ?à´?àµ¾à´?àµ?à´?à´¾à´¯à´¿ [portforward.com](http://portforward.com/) à´?à´¾à´£àµ?à´?."
 
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
@@ -5431,7 +5421,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8534,7 +8524,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8611,9 +8601,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9297,8 +9287,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "à´?à´¨àµ?à´¨àµ? à´¨àµ½à´?àµ?à´?, à´?àµ?à´?à´¾à´¤àµ? à´®àµ?à´¸à´¿à´²àµ?à´² à´¨à´¿à´?àµ?à´?à´³àµ?à´?àµ? à´¸à´?à´à´¾à´µà´¨à´¯àµ? à´?àµ?àµ¼à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¾à´£àµ? ."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "à´?àµ?àµ¼ à´¬àµ?à´°àµ?à´¸àµ¼ à´¡àµ?àµºà´²àµ?à´¡àµ?à´?àµ?à´¯àµ?à´¯àµ?à´?"
 
diff --git a/contents+my.po b/contents+my.po
index 703188ced..5046dac7a 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
@@ -892,8 +892,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -959,8 +959,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1165,14 +1165,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1213,6 +1213,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1235,6 +1245,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2316,8 +2331,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2464,7 +2479,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2525,7 +2540,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3738,8 +3753,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4304,7 +4319,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7407,7 +7422,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7484,9 +7499,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8168,8 +8183,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr ""
 
diff --git a/contents+nb.po b/contents+nb.po
index 1a414448d..deb095737 100644
--- a/contents+nb.po
+++ b/contents+nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: 490cdfb601cecc09e36402222ad5913c, 2019\n"
 "Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/otf/teams/1519/nb/)\n"
@@ -907,8 +907,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -974,8 +974,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1180,14 +1180,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1200,7 +1200,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1228,6 +1228,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1250,6 +1260,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2360,8 +2375,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2508,7 +2523,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2569,7 +2584,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3782,8 +3797,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4348,7 +4363,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7452,7 +7467,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7531,9 +7546,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8220,8 +8235,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Last ned Tor Browser"
 
diff --git a/contents+nl.po b/contents+nl.po
index de8b887f2..86e18e8cc 100644
--- a/contents+nl.po
+++ b/contents+nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Meteor 0id, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -908,8 +908,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -975,8 +975,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1181,14 +1181,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1201,7 +1201,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1229,6 +1229,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1251,6 +1261,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2363,8 +2378,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2511,7 +2526,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2572,7 +2587,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3795,8 +3810,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4361,7 +4376,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7472,7 +7487,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7551,9 +7566,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8239,8 +8254,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Geef vandaag, en Mozilla geeft hetzelfde bedrag."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
 
diff --git a/contents+pl.po b/contents+pl.po
index c0eebfac7..e68562b87 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: MichaÅ? Nowak <nowak1michal@xxxxxxxxx>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
@@ -926,8 +926,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1004,8 +1004,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1223,14 +1223,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1245,7 +1245,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1275,6 +1275,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1297,6 +1307,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2564,8 +2579,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2712,7 +2727,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2773,7 +2788,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4140,8 +4155,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4706,7 +4721,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8237,7 +8252,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8328,9 +8343,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9039,8 +9054,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "PrzekaÅ¼ dziÅ?, a Mozilla podwoi TwojÄ? dotacjÄ?."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Pobierz przeglÄ?darkÄ? Tor"
 
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index c95c3b8a5..aaffc2913 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: m tk, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -1063,12 +1063,9 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
-"Mesmo que o roteamento da onion se torne um termo domÃ©stico padrÃ£o, o Tor "
-"nasceu do [projeto de roteamento de onion ](http://www.onion-router.net/) "
-"feito pelo Naval Research Lab."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1149,8 +1146,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1368,14 +1365,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1388,7 +1385,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1416,6 +1413,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1438,6 +1445,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2697,8 +2709,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2845,7 +2857,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2908,7 +2920,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4313,8 +4325,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4879,7 +4891,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8424,7 +8436,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8516,9 +8528,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9276,8 +9288,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Doe hoje, e a Mozilla duplicarÃ¡ a sua doaÃ§Ã£o."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Baixar o Navegador Tor"
 
diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index 0fc2914d3..13e760f1b 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Rui Melo <viper5000pt@xxxxxxxxx>, 2019\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
@@ -932,8 +932,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -1006,8 +1006,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1222,14 +1222,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1242,7 +1242,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1270,6 +1270,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1292,6 +1302,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2562,8 +2577,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2710,7 +2725,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2771,7 +2786,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4142,8 +4157,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4708,7 +4723,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -8253,7 +8268,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -8344,9 +8359,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -9055,8 +9070,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Doe hoje e a Mozilla irÃ¡ igualar o seu donativo."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Transferir o Tor Browser"
 
diff --git a/contents+ro.po b/contents+ro.po
index 55d2c32d3..d93a7dd0c 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: eduard pintilie <eduard.pintilie@xxxxxxxxx>, 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -922,8 +922,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -996,8 +996,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1210,14 +1210,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1230,7 +1230,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1258,6 +1258,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1280,6 +1290,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2402,8 +2417,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2550,7 +2565,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2611,7 +2626,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3837,8 +3852,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4403,7 +4418,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7510,7 +7525,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7587,9 +7602,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8271,8 +8286,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "DoneazÄ? azi, È?i Mozilla va dona Ã®n aceeaÈ?i mÄ?surÄ?."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "DescÄ?rcare Tor Browser"
 
diff --git a/contents+ru.po b/contents+ru.po
index 05ed0a0c4..34077080c 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -9,18 +9,18 @@
 # Vitaliy Grishenko, 2019
 # Evgeny Malyshev <evgeny.malyshev.sss@xxxxxxxxx>, 2019
 # Andrey Kostrikov <yavinav@xxxxxxxxx>, 2019
-# erinm, 2019
 # solokot <solokot@xxxxxxxxx>, 2019
 # Sergey Smirnov <cj75300@xxxxxxxxx>, 2019
 # Ð?Ð°Ñ?Ð¸Ñ? Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ <mary.romanenko@xxxxxxxxx>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: Ð?Ð°Ñ?Ð¸Ñ? Ð Ð¾Ð¼Ð°Ð½ÐµÐ½ÐºÐ¾ <mary.romanenko@xxxxxxxxx>, 2019\n"
+"Last-Translator: erinm, 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"
@@ -925,8 +925,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -998,8 +998,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1210,14 +1210,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1230,7 +1230,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1258,6 +1258,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1280,6 +1290,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2504,8 +2519,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2652,7 +2667,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2713,7 +2728,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -4053,8 +4068,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4619,7 +4634,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7906,7 +7921,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7997,9 +8012,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8702,8 +8717,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Ð?Ð¾Ð¶ÐµÑ?Ñ?Ð²Ñ?Ð¹Ñ?Ðµ Ñ?ÐµÐ³Ð¾Ð´Ð½Ñ? Ð¸ Mozilla Ñ?Ð´Ð²Ð¾Ð¸Ñ? Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾Ð²Ð°Ð½Ð¸Ðµ."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Tor Browser"
 
diff --git a/contents+sr.po b/contents+sr.po
index 0cd9bee4f..d44ad6ead 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-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Aleksa RistiÄ?, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -897,8 +897,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -964,8 +964,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1170,14 +1170,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1218,6 +1218,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1240,6 +1250,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2346,8 +2361,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2494,7 +2509,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2555,7 +2570,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3777,8 +3792,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4343,7 +4358,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7446,7 +7461,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7523,9 +7538,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8207,8 +8222,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Preuzmi Tor pregledaÄ?"
 
diff --git a/contents+sv.po b/contents+sv.po
index 234f5a745..9d62654fd 100644
--- a/contents+sv.po
+++ b/contents+sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Jonatan Nyberg, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -897,8 +897,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -964,8 +964,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1170,14 +1170,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1190,7 +1190,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1218,6 +1218,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1240,6 +1250,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2326,8 +2341,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2474,7 +2489,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2535,7 +2550,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3755,8 +3770,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4321,7 +4336,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7424,7 +7439,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7501,9 +7516,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8185,8 +8200,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Ge idag, och Mozilla kommer att matcha din donation."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr ""
 
diff --git a/contents+sw.po b/contents+sw.po
index 02c67530a..a0e73489b 100644
--- a/contents+sw.po
+++ b/contents+sw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n"
@@ -892,8 +892,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -959,8 +959,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1165,14 +1165,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1213,6 +1213,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1235,6 +1245,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2318,8 +2333,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2466,7 +2481,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2527,7 +2542,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3745,8 +3760,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4311,7 +4326,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7414,7 +7429,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7491,9 +7506,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8175,8 +8190,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Pakua kivinjari cha Tor"
 
diff --git a/contents+th.po b/contents+th.po
index c5a0b6c19..05de22d6c 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: DN DN <deen6@xxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -900,8 +900,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -967,8 +967,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1173,14 +1173,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1193,7 +1193,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1221,6 +1221,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1243,6 +1253,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2324,8 +2339,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2472,7 +2487,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2533,7 +2548,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3746,8 +3761,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4312,7 +4327,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7415,7 +7430,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7492,9 +7507,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8176,8 +8191,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "à¸?à¸£à¸´à¸?à¸²à¸?à¸§à¸±à¸?à¸?à¸µà¹?à¹?à¸¥à¸°à¸¡à¸à¸?à¸´à¸¥à¸¥à¸²à¸?à¸°à¸ªà¸¡à¸?à¸?à¹?à¸?à¹?à¸²à¸?à¸±à¸?à¸?à¸µà¹?à¸?à¸¸à¸?à¹?à¸«à¹?"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?à¹?à¸?à¸£à¸²à¸§à¹?à¹?à¸?à¸à¸£à¹? Tor"
 
diff --git a/contents+tr.po b/contents+tr.po
index 31423489d..6fdfcaee7 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -3,17 +3,17 @@
 # Cenk YÄ±ldÄ±zlÄ± <goncagul@national.shitposting.agency>, 2019
 # erinm, 2019
 # Lale FatoÅ? TunÃ§man <latuna63@xxxxxxxxx>, 2019
-# Emma Peel, 2019
 # dersteppenwolfx, 2019
 # Kaya Zeren <kayazeren@xxxxxxxxx>, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: Kaya Zeren <kayazeren@xxxxxxxxx>, 2019\n"
+"Last-Translator: Emma Peel, 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"
@@ -1084,12 +1084,9 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
-"Onion routing gÃ¼nlÃ¼k kullanÄ±lan bir terim olsa bile, Tor Donanma AraÅ?tÄ±rma "
-"LaboratuvarlarÄ± tarafÄ±ndan yÃ¼rÃ¼tÃ¼len gerÃ§ek [onion routing "
-"projesi](http://www.onion-router.net/) iÃ§inden Ã§Ä±ktÄ±."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1168,11 +1165,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
-"Ã?rneÄ?in, `torbrowser-install-win64-9.0.1_en-US.exe` dosyasÄ±nÄ±n imza dosyasÄ± "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc` Å?eklindedir."
+"Ã?rneÄ?in, `torbrowser-install-win64-9.0_en-US.exe` dosyasÄ±nÄ±n imza dosyasÄ± "
+"`torbrowser-install-win64-9.0_en-US.exe.asc` Å?eklindedir."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1413,19 +1410,19 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1439,10 +1436,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1471,6 +1468,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr "#### Ã?Ã¶zÃ¼m (herkese aÃ§Ä±k bir anahtar kullanarak)"
 
@@ -1500,6 +1507,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2868,14 +2880,9 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
-"Bir virusten korunma uygulamasÄ± kullanÄ±yorsanÄ±z [VirÃ¼s ya da kÃ¶tÃ¼ amaÃ§lÄ± "
-"yazÄ±lÄ±mdan korunma uygulamam Tor Browser kullanmamÄ± "
-"engelliyor](http://support.torproject.org/#tbb-10) bÃ¶lÃ¼mÃ¼ne bakabilirsiniz. "
-"Bu tÃ¼r bir soruna genellikle virÃ¼s ya da kÃ¶tÃ¼ amaÃ§lÄ± yazÄ±lÄ±mdan korunma "
-"uygulamalarÄ± yol aÃ§ar."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -3077,11 +3084,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
-"Ancak pratikte [durum bundan daha karÄ±Å?Ä±ktÄ±r](http://fscked.org/blog/fully-";
-"automated-active-https-cookie-hijacking)."
 
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
@@ -3163,14 +3168,8 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
-"Vekil sunucunuz iÃ§in kimlik doÄ?rulamasÄ± gerekiyorsa, HTTPProxyAuthenticator "
-"ve HTTPSProxyAuthenticator ayarlarÄ±nÄ±n ne olduÄ?una da bakÄ±n. Å?u anda yalnÄ±z "
-"temel kimlik doÄ?rulama yÃ¶ntemini destekliyoruz. Bununla birlikte NTLM kimlik"
-" doÄ?rulama yÃ¶ntemini kullanmanÄ±z gerekiyorsa [bu arÅ?iv "
-"yazÄ±sÄ±](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) iÅ?inize "
-"yarayabilir."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)
@@ -4709,12 +4708,9 @@ msgstr "Bir adres dÃ¶nÃ¼Å?tÃ¼rÃ¼cÃ¼ (NAT) ya da gÃ¼venlik duvarÄ± arkasÄ±ndayÄ±m
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
-"Adres dÃ¶nÃ¼Å?tÃ¼rÃ¼cÃ¼ (NAT) ya da yÃ¶neltici (router) aygÄ±tÄ±nÄ±z Ã¼zerinde kapÄ± "
-"numarasÄ± yÃ¶nlendirme iÅ?lemlerinin nasÄ±l yapÄ±lacaÄ?Ä± ile ilgili bilgi almak "
-"iÃ§in [portforward.com](http://portforward.com/) adresine bakabilirsiniz."
 
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
@@ -5438,13 +5434,8 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
-"AyrÄ±ntÄ±lÄ± bilgi almak iÃ§in [Å?u gÃ¼nlÃ¼k "
-"yazÄ±sÄ±na](https://blog.torproject.org/blog/lifecycle-of-a-new-relay) ya da "
-"[Changing of the Guards: A Framework for Understanding and Improving Entry "
-"Guard Selection in Tor](http://freehaven.net/anonbib/#wpes12-cogs) "
-"makalesine bakabilirsiniz."
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.title)
@@ -9191,7 +9182,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -9283,9 +9274,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -10077,8 +10068,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "BugÃ¼n yaptÄ±Ä?Ä±nÄ±z her baÄ?Ä±Å? kadar Mozilla da baÄ?Ä±Å? yapacak."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Tor Browser uygulamasÄ±nÄ± indirin"
 
diff --git a/contents+uk.po b/contents+uk.po
index 1ebccd894..126a982d5 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: nobik <nobikik9@xxxxxxxxx>, 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -898,8 +898,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -965,8 +965,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1171,14 +1171,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1191,7 +1191,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1219,6 +1219,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1241,6 +1251,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2329,8 +2344,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2477,7 +2492,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2538,7 +2553,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3761,8 +3776,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4327,7 +4342,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7434,7 +7449,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7512,9 +7527,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8200,8 +8215,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Ð?Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ð°Ð¹Ñ?Ðµ Ñ?Ñ?Ð¾Ð³Ð¾Ð´Ð½Ñ?, Ñ? Mozilla Ð²Ñ?Ð´Ð´Ñ?Ñ?Ð¸Ñ?Ñ? Ð·Ð° Ð²Ð°Ñ?Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼ÐºÑ?."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr ""
 
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 840dd0a54..f4c7da678 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -7,17 +7,17 @@
 # AngelFalse, 2019
 # MD Rights <psychi2009@xxxxxxxxx>, 2019
 # Cloud P <heige.pcloud@xxxxxxxxxxx>, 2019
-# erinm, 2019
 # ff98sha, 2019
 # YFdyh000 <yfdyh000@xxxxxxxxx>, 2019
 # shenzhui007 <12231252@xxxxxxxxxxx>, 2019
+# erinm, 2019
 # Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -925,8 +925,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -994,8 +994,8 @@ msgstr "å®?ä»¬å??è®¸ä½ éª?è¯?ä½ ä¸?è½½ç??æ??ä»¶æ£æ?¯æ??ä»¬å¸?æ??ä½ è?·å??ç??æ??
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1208,16 +1208,20 @@ msgstr "ä¸?é?¢ç??ä¾?å?å??è®¾ä½ å·²ç»?ä¸?è½½äº?è¿?æ ·ç??ä¸¤ä¸ªæ??ä»¶å?°ä½ ç??\"
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
+"US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1228,9 +1232,11 @@ msgstr "#### å¯¹äº? GNU/Linux ç??ç?¨æ?·ï¼?å¦?æ??æ?¨æ??32ä½?ç??å®?è£?å??ï¼?è¯·å°?
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
+"US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1258,6 +1264,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1283,6 +1299,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2375,8 +2396,8 @@ msgstr "è¯·ç¡®è®¤ä½ å?ªæ??ä¸?ä¸ª Tor æµ?è§?å?¨å?¨è¿?è¡?å¹¶ä¸?ä½ ç?? Tor æµ?è§?
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2525,7 +2546,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2586,7 +2607,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3854,8 +3875,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4420,7 +4441,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7658,7 +7679,7 @@ msgstr "å¾?å¤?å?ºå?£è??ç?¹ä¼?è®¾ç½®æ??é?»æ¢ BitTorrent ä¸?ç±»ç??æ??ä»¶å?±äº«æ??
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7738,9 +7759,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8439,8 +8460,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "ç?°å?¨æ??æ¬¾ï¼? Mozilla ä¼?å?¹é??ä½ ç??æ??èµ ã??"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "ä¸?è½½ Tor æµ?è§?å?¨"
 
diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index ae280e3eb..3f90b38c8 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -1,18 +1,18 @@
 # Translators:
 # Emma Peel, 2019
-# erinm, 2019
 # å?é?¦ ç??, 2019
 # Bryce Tsao <tsaodingtw@xxxxxxxxx>, 2019
 # ç?·å©ä¸?å£?, 2019
 # ian chou <ertiach@xxxxxxxxxxx>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: ian chou <ertiach@xxxxxxxxxxx>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -895,8 +895,8 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
@@ -962,8 +962,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1168,14 +1168,14 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
 
@@ -1188,7 +1188,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
 
@@ -1216,6 +1216,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr ""
 
@@ -1238,6 +1248,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ""
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2319,8 +2334,8 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-43/
@@ -2467,7 +2482,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
 
@@ -2528,7 +2543,7 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-47/
@@ -3747,8 +3762,8 @@ msgstr ""
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
 
 #: https//support.torproject.org/operators/behind-nat/
@@ -4313,7 +4328,7 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 
 #: https//support.torproject.org/operators/offline-ed25519/
@@ -7416,7 +7431,7 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-14/
@@ -7493,9 +7508,9 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 
 #: https//support.torproject.org/misc/misc-3/
@@ -8177,8 +8192,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "ä»?æ?¥æ?¨æ??æ¬¾ï¼?Mozilla ä¹?æ??æ??å?ºç?¸å??æ?¸é¡?ã??"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "ä¸?è¼? Tor ç??è¦½å?¨"
 
diff --git a/contents.pot b/contents.pot
index c36393f79..28c74eaaa 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-11-08 11:23+CET\n"
+"POT-Creation-Date: 2019-11-14 13:20+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"
@@ -1052,12 +1052,12 @@ msgstr ""
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
 msgid ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 msgstr ""
 "Even if onion routing has become a standard household term, Tor was born out"
-" of the actual [onion routing project](http://www.onion-router.net/) run by "
-"the Naval Research Lab."
+" of the actual [onion routing project](https://www.onion-router.net/) run by"
+" the Naval Research Lab."
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1137,11 +1137,11 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 msgstr ""
-"For example, `torbrowser-install-win64-9.0.1_en-US.exe` is accompanied by "
-"`torbrowser-install-win64-9.0.1_en-US.exe.asc`."
+"For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by "
+"`torbrowser-install-win64-9.0_en-US.exe.asc`."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1384,19 +1384,19 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 msgstr ""
-"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0.1_en-"
-"US.exe.asc Downloads\torbrowser-install-win64-9.0.1_en-US.exe"
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-9.0_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-9.0_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0.1-osx64_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-9.0-osx64_en-"
 "US.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1409,10 +1409,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 msgstr ""
-"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0.1_en-"
+"gpgv --keyring ./tor.keyring ~/Downloads/tor-browser-linux64-9.0_en-"
 "US.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
@@ -1441,6 +1441,16 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "<<<<<<< HEAD"
+msgstr "<<<<<<< HEAD"
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid "======="
+msgstr "======="
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "#### Workaround (using a public key)"
 msgstr "#### Workaround (using a public key)"
 
@@ -1470,6 +1480,11 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
+msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+msgstr ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae"
+
+#: https//support.torproject.org/tbb/how-to-verify-signature/
+#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "You may also want to [learn more about "
 "GnuPG](https://www.gnupg.org/documentation/)."
@@ -2802,13 +2817,13 @@ msgstr ""
 msgid ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 msgstr ""
 "If you are running an anti-virus, please see [My antivirus/malware "
 "protection is blocking me from accessing Tor "
-"Browser](http://support.torproject.org/#tbb-10), it is common for anti-virus"
-" / anti-malware software to cause this type of issue."
+"Browser](https://support.torproject.org/#tbb-10), it is common for anti-"
+"virus / anti-malware software to cause this type of issue."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
@@ -3000,10 +3015,10 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/contents+en.lrquestion.description)
 msgid ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 msgstr ""
-"In practice, alas, it's [way more complex than that](http://fscked.org/blog";
+"In practice, alas, it's [way more complex than that](https://fscked.org/blog";
 "/fully-automated-active-https-cookie-hijacking)."
 
 #: https//support.torproject.org/tbb/tbb-45/
@@ -3084,12 +3099,12 @@ msgid ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
 "Also, read up on the HTTPProxyAuthenticator and HTTPSProxyAuthenticator "
 "options if your proxy requires auth. We only support basic auth currently, "
 "but if you need NTLM authentication, you may find [this post in the "
-"archives](http://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
+"archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)
@@ -4583,11 +4598,11 @@ msgstr "I'm behind a NAT/Firewall."
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
 msgid ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 msgstr ""
-"See [portforward.com](http://portforward.com/) for directions on how to port"
-" forward with your NAT/router device."
+"See [portforward.com](https://portforward.com/) for directions on how to "
+"port forward with your NAT/router device."
 
 #: https//support.torproject.org/operators/behind-nat/
 #: (content/operators/behind-nat/contents+en.lrquestion.description)
@@ -5288,12 +5303,12 @@ msgid ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 msgstr ""
 "Read more details in this [blog post](https://blog.torproject.org/blog";
 "/lifecycle-of-a-new-relay) or in [Changing of the Guards: A Framework for "
 "Understanding and Improving Entry Guard Selection in "
-"Tor](http://freehaven.net/anonbib/#wpes12-cogs)."
+"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)."
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.title)
@@ -9110,10 +9125,10 @@ msgstr ""
 #: (content/misc/misc-12/contents+en.lrquestion.description)
 msgid ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 "BitTorrent in particular is [not anonymous over "
-"Tor.](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)"
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)
@@ -9205,14 +9220,14 @@ msgstr ""
 #: (content/misc/misc-3/contents+en.lrquestion.description)
 msgid ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 msgstr ""
 "Check out a list of all [our "
-"sponsors](https://www.torproject.org/about/sponsors.html.en) and a series of"
-" [blog posts](https://blog.torproject.org/category/tags/form-990) on our "
-"financial reports."
+"sponsors](https://www.torproject.org/about/sponsors/) and a series of [blog "
+"posts](https://blog.torproject.org/category/tags/form-990) on our financial "
+"reports."
 
 #: https//support.torproject.org/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -9996,8 +10011,8 @@ msgid "Give today, and Mozilla will match your donation."
 msgstr "Give today, and Mozilla will match your donation."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:74 templates/footer.html:9
-#: templates/footer.html:18 templates/navbar.html:74
+#: lego/templates/navbar.html:79 templates/footer.html:9
+#: templates/footer.html:18 templates/navbar.html:79
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"

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

Prev by Author: [tor-commits] [translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
Next by Author: [tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
Previous by thread: [tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
Next by thread: [tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
Index(es):
- Author
- Thread