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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
From: translation@xxxxxxxxxxxxxx
Date: Tue, 17 Sep 2019 13:53:37 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 17 Sep 2019 09:54:12 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit fc154ece11ae9fe904a1ec0b7c6d79573ae489ac
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Tue Sep 17 13:53:34 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+am.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ar.po    | 103 +++++++++++++++++++++++++++++++++-------------------
 contents+az.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+be.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+bg.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+bn.po    |  95 ++++++++++++++++++++++++++++++++----------------
 contents+bo.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ca.po    | 101 ++++++++++++++++++++++++++++++++-------------------
 contents+cs.po    |  95 ++++++++++++++++++++++++++++++++----------------
 contents+da.po    |  93 ++++++++++++++++++++++++++++++++---------------
 contents+de.po    | 102 ++++++++++++++++++++++++++++++++-------------------
 contents+el.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+en_GB.po |  91 +++++++++++++++++++++++++++++++---------------
 contents+eo.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+es-AR.po |  99 ++++++++++++++++++++++++++++++++------------------
 contents+es.po    | 101 ++++++++++++++++++++++++++++++++-------------------
 contents+et.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+eu.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+fa.po    |  99 ++++++++++++++++++++++++++++++++------------------
 contents+fi.po    |  97 ++++++++++++++++++++++++++++++++-----------------
 contents+fr.po    | 107 +++++++++++++++++++++++++++++++++---------------------
 contents+ga.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+gl.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+he.po    |  99 +++++++++++++++++++++++++++++++++-----------------
 contents+hi.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+hr.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+hu.po    |  95 ++++++++++++++++++++++++++++++++----------------
 contents+id.po    | 104 ++++++++++++++++++++++++++++++++--------------------
 contents+is.po    | 105 +++++++++++++++++++++++++++++++++--------------------
 contents+it.po    | 103 +++++++++++++++++++++++++++++++++-------------------
 contents+ja.po    |  93 ++++++++++++++++++++++++++++++++---------------
 contents+ka.po    | 101 ++++++++++++++++++++++++++++++++-------------------
 contents+kk.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+km.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ko.po    | 101 +++++++++++++++++++++++++++++++++------------------
 contents+lt.po    |  97 +++++++++++++++++++++++++++++++++----------------
 contents+lv.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+mk.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ml.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ms.po    | 101 ++++++++++++++++++++++++++++++++-------------------
 contents+my.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+nb.po    |  97 +++++++++++++++++++++++++++++++++----------------
 contents+nl.po    | 102 ++++++++++++++++++++++++++++++++-------------------
 contents+nn.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+pl.po    | 106 +++++++++++++++++++++++++++++++++--------------------
 contents+pt-BR.po | 102 ++++++++++++++++++++++++++++++++-------------------
 contents+pt-PT.po | 103 +++++++++++++++++++++++++++++++++-------------------
 contents+ro.po    | 102 ++++++++++++++++++++++++++++++++-------------------
 contents+ru.po    | 101 ++++++++++++++++++++++++++++++++-------------------
 contents+sk.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+sl.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+sq.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+sr.po    | 100 ++++++++++++++++++++++++++++++++------------------
 contents+sv.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+sw.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ta.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+th.po    | 103 +++++++++++++++++++++++++++++++++-------------------
 contents+tr.po    | 106 +++++++++++++++++++++++++++++++++--------------------
 contents+uk.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+ur.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+uz.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+vi.po    |  91 +++++++++++++++++++++++++++++++---------------
 contents+zh-CN.po | 101 +++++++++++++++++++++++++++++++++------------------
 contents+zh-TW.po |  97 ++++++++++++++++++++++++++++++++-----------------
 contents.pot      | 104 ++++++++++++++++++++++++++++++++++------------------
 65 files changed, 4122 insertions(+), 2114 deletions(-)

diff --git a/contents+am.po b/contents+am.po
index caac23b3f..8d5bbb177 100644
--- a/contents+am.po
+++ b/contents+am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Amharic (https://www.transifex.com/otf/teams/1519/am/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ar.po b/contents+ar.po
index 009213c1b..bc8914766 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1,20 +1,20 @@
 # Translators:
 # Martus Translations <translations@xxxxxxxxxx>, 2019
 # erinm, 2019
-# Ahmed A. <6622227a@xxxxxxxxx>, 2019
 # Khaled Hosny, 2019
 # ButterflyOfFire, 2019
 # Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2019
 # Emma Peel, 2019
 # Ahmed IB <mee.tbhole@xxxxxxxxx>, 2019
+# Ahmed A. <6622227a@xxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Ahmed IB <mee.tbhole@xxxxxxxxx>, 2019\n"
+"Last-Translator: Ahmed A. <6622227a@xxxxxxxxx>, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,6 +99,8 @@ msgstr "Ø§Ù?Ø±Ø¹Ø§Ø©"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -198,13 +200,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Ø±Ø¬Ø§Ø¡Ù? ØÙ?Ù? Ù?Ø³Ø®Ø© Ø£Ù?Ù?Ø§ Ù?Ù?Ø· Ø¥Ù? Ù?Ù?Øª Ù?Ø§ ØªÙ?Ø§Ù?Ø¹ Ø£Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ø£Ø´Ù?Ø§Ø¡ Ù?Ø§ ØªØ¹Ù?Ù? Ø¨ØµÙ?Ø±Ø© ØµØÙ?ØØ© "
-"Ù?ØªØ±Ù?Ø¯ Ù?Ø³Ø§Ø¹Ø¯ØªÙ?Ø§ Ù?Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? [Ø§Ù?Ø£Ø®Ø·Ø§Ø¡] Ù?Ø¥Ø±Ø³Ø§Ù? Ø§Ù?ØªÙ?Ø§Ø±Ù?Ø± Ø¹Ù?Ù?Ø§ "
-"(https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)"
-" Ù?Ù?Ù?Ø· Ø¥Ù? Ù?Ù?Øª Ù?Ø§ ØªØ¬Ø¹Ù? Ù?Ù? Ù?Ù?Ø³Ù? Ø¹Ø±Ø¶Ø© Ù?Ù?Ø®Ø·Ø±."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -684,10 +682,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>Ø¯Ù?Ù?Ù? "
 "Ø§Ù?ØªÙ?Ø²Ù?Ø¹Ø©</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "ØªÙ?Ø²Ù?Ù? Ù?ØªØµÙ?Ø ØªÙ?Ø±"
 
@@ -732,7 +735,7 @@ msgstr ""
 "Ù?Ù?Ù?Ù? Ø§Ù?Ø¹Ø«Ù?Ø± Ø¹Ù?Ù? Ø§Ù?Ø¹Ù?Ø§Ù?Ø© Ø§Ù?ØªØ¬Ø§Ø±Ù?Ø© Ù?ØÙ?Ù?Ù? Ø§Ù?Ù?Ø´Ø± Ù?Ù?Ù?Ø§Ø¹Ø¯ Ø§Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù? Ø§Ù?Ø·Ø±Ù? "
 "Ø§Ù?Ø«Ø§Ù?Ø« Ù?Ù?%(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Ø§Ù?Ù?Ø§Ø¦Ù?Ø©"
 
@@ -753,9 +756,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "Ù?Ø§Ù?Ø´ Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¬Ù?Ø© Ù?Ø§Ù?Ø¨Ø±Ù?ØªÙ?Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ø±ØªØ¨Ø·Ø© Ø¨Tor. Ù?Ø±ØØ¨ Ø¨Ø£Ù?Ù?Ø§Ø±Ù?."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -763,30 +764,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr "Ø´Ø§Ù?Ø¯ Ø£Ù? Ø§Ù?Ø¶Ù? Ù?Ù?Ù?Ø§Ø¡Ø§Øª Ø§Ù?Ù?Ø±Ù?Ù? Ø§Ù?Ø¹Ø§Ù?Ø©."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Ù?Ø§Ù?Ø´ ØªØ´ØºÙ?Ù? ØªØÙ?Ù?Ù?Ø© Ù?ØªÙ?Ø± Tor relay."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "ØªØØ¯Ø« Ø¥Ù?Ù? Ù?Ø¬ØªÙ?Ø¹ Tor Ù?Ù?Ø¬Ù?Ù?Ø¨ Ø§Ù?Ø¹Ø§Ù?Ù?Ù?."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Ø§Ø¹Ø«Ø± Ø¹Ù?Ù?Ù?Ø§ Ù?Ù? Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?ØªÙ?Ø§ØµÙ? Ø§Ù?Ø§Ø¬ØªÙ?Ø§Ø¹Ù?"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "ØªØ·Ù?Ø¹ Ù?Ø¹ Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Ø´Ø§Ø±Ù?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Ø§Ù?Ø¶Ù? Ù?Ù?Ø§Ø¦Ù?Ø© Ø¨Ø±Ù?Ø¯Ù?Ø©"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -794,11 +808,11 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Ø£Ø±Ø³Ù? ØªÙ?Ø±Ù?Ø± Ø¹Ù? Ø®Ø·Ø£ Ø£Ù? Ø£Ø¹Ø· ØªØºØ°Ù?Ø© Ø±Ø§Ø¬Ø¹Ø©"
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -808,21 +822,21 @@ msgstr ""
 "Ø§Ù?Ø¨Ø±Ù?Ø¬Ù?Ø§Øª Ù?Ø§Ù?Ù?ØµØ§Ø¯Ø±, Ù?Ø°Ù?Ù? Ù?Ø¥Ù? Ø§Ù?ØªØºØ°Ù?Ø© Ø§Ù?Ø±Ø§Ø¬Ø¹Ø© Ù?Ù?Ù? feedback Ù?Ù?Ù?Ù?Ø© Ø¬Ø¯Ø§Ù? Ø¨Ø§Ù?Ù?Ø³Ø¨Ø©"
 " Ù?Ù?Ø§ (Ù?Ù?Ø¬Ù?Ù?Ø¹ Ù?Ø³ØªØ®Ø¯Ù?Ù? Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Ø£Ø®Ø¨Ø±Ù?Ø§ Ø¹Ù? ØªØÙ?Ù?Ù?Ø© Ø³Ù?Ø¦Ø©."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Ø£Ø¨Ù?Øº Ø¹Ù? Ù?Ø´Ù?Ù?Ø© Ø£Ù?Ù?Ù?Ø©."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -831,11 +845,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Ø±Ø§Ø³Ù?Ù?Ø§ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -843,7 +857,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Ø£Ø±Ø³Ù? Ù?Ù?Ø§ Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù?"
 
@@ -864,9 +878,8 @@ msgid "Go to Google Play"
 msgstr "Ø§Ù?ØªÙ?Ù? Ø¥Ù?Ù? Ù?ØªØ¬Ø± ØºÙ?ØºÙ? Ù?Ù?ØªØ·Ø¨Ù?Ù?Ø§Øª"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Ø¥Ø°Ù?Ø¨ Ø¥Ù?Ù? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -981,8 +994,8 @@ msgid "Download in another language or platform"
 msgstr "Ø§Ù?ØªÙ?Ø²Ù?Ù? Ø¨Ù?ØºØ© Ø£Ù? Ù?Ù?ØµØ© Ø£Ø®Ø±Ù? "
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Ø§Ù?Ø®Ù?Ø§Ø±Ø§Øª Ø§Ù?Ù?ØªÙ?Ø¯Ù?Ø© Ù?Ù?ØªØ«Ø¨Ù?Øª"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1109,7 +1122,7 @@ msgstr "Ù?Ø¯Ø¹Ù?Ù? Ù?Ù?Ø§Ù?Ø¶Ù?Ø§Ù? Ø¥Ù?Ù?Ù?Ø§ Ù?Ù? IRC Ù?ØªØ¹Ø±Ù? Ù?Ù?Ù? Ù?Ù?Ù?
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Ù?Ø´Ø±Ù?Ø¹ Tor Project | Ø§Ù?Ø®ØµÙ?ØµÙ?Ø© Ù?Ø§Ù?ØØ±Ù?Ø© Ø¹Ù?Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª "
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø±"
 
@@ -1255,7 +1268,7 @@ msgstr "Ø´ØºÙ?Ù? ØªØÙ?Ù?Ù?Ø© Ù?Ø¬Ø¹Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ø£Ø³Ø±Ø¹ Ù? Ù?Ø§Ù?Ø±Ù?Ø²Ù?Ø©
 msgid "Use your skills to volunteer."
 msgstr "Ø§Ø³ØªØ®Ø¯Ù? Ù?Ù?Ø§Ø±Ø§ØªÙ? Ù?Ù?ØªØ·Ù?Ø¹"
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Ø¯Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?ØªØµÙ?Ø Tor Browser"
 
@@ -1263,6 +1276,22 @@ msgstr "Ø¯Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?ØªØµÙ?Ø Tor Browser"
 msgid "Read more."
 msgstr "Ø§Ù?Ø±Ø£ Ø§Ù?Ù?Ø²Ù?Ø¯."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Ø±Ø§Ø¨Ø· Ø«Ø§Ø¨Øª"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Ù?Ø´Ø§Ù?Ø¯Ø© Ù?Ù?Ù? PDF"
diff --git a/contents+az.po b/contents+az.po
index b1571676a..46243e4c8 100644
--- a/contents+az.po
+++ b/contents+az.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/otf/teams/1519/az/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor LayihÉ?si"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+be.po b/contents+be.po
index a70711c58..d13fedf6a 100644
--- a/contents+be.po
+++ b/contents+be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Belarusian (https://www.transifex.com/otf/teams/1519/be/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+bg.po b/contents+bg.po
index bb1cbf141..d412a4580 100644
--- a/contents+bg.po
+++ b/contents+bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ð?Ñ?Ð¾ÐµÐºÑ?Ð° Tor"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+bn.po b/contents+bn.po
index 28323c030..b2cb85fb7 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -3,16 +3,16 @@
 # lisa hayat, 2019
 # erinm, 2019
 # Tabiha Tanha <tabihatanha@xxxxxxxxxx>, 2019
-# Emma Peel, 2019
 # code smite <codesmite@xxxxxxxxx>, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: code smite <codesmite@xxxxxxxxx>, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,6 +98,8 @@ msgstr "à¦?à¦¦à§?à¦¯à§?à¦?à§?à¦¤à¦¾"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -195,8 +197,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -598,10 +600,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨"
 
@@ -648,7 +655,7 @@ msgstr ""
 "à¦?à§?à¦°à§?à¦¡à¦®à¦¾à¦°à§?à¦?, à¦?à¦ªà¦¿à¦°à¦¾à¦?à¦? à¦¬à¦¿à¦?à§?à¦?à¦ªà§?à¦¤à¦¿ à¦?à¦¬à¦? à¦¤à§?à¦¤à§?à¦¯à¦¼ à¦ªà¦?à§?à¦·à§?à¦° à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦°à§?à¦° à¦¨à¦¿à¦¯à¦¼à¦®à¦¾à¦¬à¦²à§? à¦?à¦®à¦¾à¦¦à§?à¦° "
 "%(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -669,9 +676,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -679,30 +684,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -710,32 +728,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -744,11 +762,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -756,7 +774,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -777,8 +795,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -889,7 +906,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1010,7 +1027,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "à¦?à¦° à¦ªà§?à¦°à¦?à¦²à§?à¦ª"
 
@@ -1155,7 +1172,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1163,6 +1180,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "à¦ªà¦¾à¦°à§?à¦®à¦¾à¦²à¦¿à¦?à§?à¦?"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+bo.po b/contents+bo.po
index 8a42fe785..aa034c68f 100644
--- a/contents+bo.po
+++ b/contents+bo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Tibetan (https://www.transifex.com/otf/teams/1519/bo/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ca.po b/contents+ca.po
index 958ae5fa9..a2cb03d1b 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -1,17 +1,17 @@
 # Translators:
 # Jaime MuÃ±oz MartÃn <jmmartin_5@xxxxxxxxxxx>, 2019
-# Emma Peel, 2019
 # erinm, 2019
 # jmontane, 2019
 # Ecron <ecron_89@xxxxxxxxxxx>, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Ecron <ecron_89@xxxxxxxxxxx>, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,6 +98,8 @@ msgstr "Patrocinadors"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -198,13 +200,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Baixeu una alfa nomÃ©s si us sembla bÃ© que algunes coses no funcionen "
-"correctament, si voleu ajudar-nos a trobar i [notificar "
-"errors](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" i si no us esteu posant en perill."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -629,10 +627,15 @@ msgstr ""
 " href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>directori de "
 "distribuciÃ³</a>. "
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Baixeu el Navegador Tor"
 
@@ -681,7 +684,7 @@ msgstr ""
 "Podeu trobar informaciÃ³ sobre la marca, avisos de drets d'autor, i regles "
 "per a l'Ãºs per part de tercers en les %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃº"
 
@@ -703,42 +706,51 @@ msgstr ""
 "Discutiu sobre el codi i els protocols del Tor. AgraÃ¯m les vostres idees."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discutiu sobre temes relacionats amb l'organitzaciÃ³ i la comunitat: "
-"trobades, participaciÃ³, traducciÃ³, o millores del lloc web."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Mireu o uniu-vos a les nostres reunions pÃºbliques."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discutiu sobre mantenir un node Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Parleu amb la comunitat del Tor global del sur."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Trobeu-nos a les xarxes socials"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Feu-vos voluntari del Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Involucreu-vos"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Uniu-vos a una llista de correu"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -746,32 +758,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -780,11 +792,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -792,7 +804,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -813,8 +825,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -925,7 +936,7 @@ msgid "Download in another language or platform"
 msgstr "Baixeu-lo en altra llengua o plataforma"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1046,7 +1057,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projecte Tor"
 
@@ -1191,7 +1202,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1199,6 +1210,22 @@ msgstr ""
 msgid "Read more."
 msgstr "MÃ©s informaciÃ³."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Mostra el PDF"
diff --git a/contents+cs.po b/contents+cs.po
index 972ce75f6..0459e46ac 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -1,14 +1,14 @@
 # Translators:
-# Michal Stanke <mstanke@xxxxxxxxxx>, 2019
 # erinm, 2019
+# Michal Stanke <mstanke@xxxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,6 +88,8 @@ msgstr "SponzoÅ?i"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "StÃ¡hnout prohlÃÅ¾eÄ? Tor"
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Zapojte se"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "TrvalÃ½ odkaz"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+da.po b/contents+da.po
index bb9b29a4c..6d1b7f0de 100644
--- a/contents+da.po
+++ b/contents+da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -94,6 +94,8 @@ msgstr "Sponsorere"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -187,8 +189,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -594,10 +596,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
 
@@ -646,7 +653,7 @@ msgstr ""
 "VaremÃ¦rke, copyrightnotitser og regler om anvendelse af tredjeparter findes "
 "i vores %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -667,9 +674,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -677,30 +682,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Find os pÃ¥ de sociale medier"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Deltag"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Deltag pÃ¥ en e-mailliste"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -708,32 +726,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "RapportÃ©r en fejl eller giv feedback."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "FortÃ¦l os om et dÃ¥rligt relÃ¦."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "RapportÃ©r et sikkerhedsproblem."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -742,11 +760,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "E-mail os"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -754,7 +772,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Send post til os"
 
@@ -775,9 +793,8 @@ msgid "Go to Google Play"
 msgstr "GÃ¥ til Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "GÃ¥ til F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -887,7 +904,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1014,7 +1031,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-projektet"
 
@@ -1159,7 +1176,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Brug dine evner som frivillig."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser-manual"
 
@@ -1167,6 +1184,22 @@ msgstr "Tor Browser-manual"
 msgid "Read more."
 msgstr "LÃ¦s mere."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Vis PDF"
diff --git a/contents+de.po b/contents+de.po
index f4f6ef382..259940400 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -105,6 +105,8 @@ msgstr "Sponsoren"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -207,14 +209,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Bitte lade ein Alpha nur herunter, wenn du damit einverstanden bist, dass "
-"einige Dinge nicht richtig funktionieren, uns helfen mÃ¶chtest, Fehler zu "
-"finden und [zu "
-"melden](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" und du dich damit nicht gefÃ¤hrdest."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -762,10 +759,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>Verteilerverzeichnis"
 " </a> verfÃ¼gbar."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor Browser herunterladen"
 
@@ -815,7 +817,7 @@ msgstr ""
 "Markenrechts-, Copyright-Mitteilungen und Regeln fÃ¼r Drittparteien finden "
 "sich in unserer %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃ¼"
 
@@ -837,12 +839,8 @@ msgstr ""
 "Diskutiere Tor-bezogene Kodierungen und Protokolle. Ideen sind willkommen."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Diskutiere organisations- und community-bezogene Themen: Meetups, "
-"Ã?ffentlichkeitsarbeit, Ã?bersetzung oder Verbesserungen der Webseite."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
@@ -850,30 +848,43 @@ msgstr ""
 "Schaue dir Ã¶ffentlich aufgezeichnete Team-Meetings an oder nimm daran teil."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Diskutiere den Betrieb eines Tor-Relay."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Sprich mit Tors Community des globalen SÃ¼dens."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Finde uns auf Social Media"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Freiwillige Arbeit mit Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Mitmachen"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Einer E-Mail-Liste beitreten"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -886,11 +897,11 @@ msgstr ""
 " kannst du die entsprechende Liste anfragen. Du kannst dich gerne anmelden "
 "und auch nur zusehen :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Melde einen Fehler oder gib Feedback."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -901,11 +912,11 @@ msgstr ""
 "verbessern, so ist dein Feedback fÃ¼r uns (und alle Tor-Benutzer) Ã¤uÃ?erst "
 "wertvoll."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Melde uns ein schlechtes Relay."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -914,11 +925,11 @@ msgstr ""
 "konfiguriert oder anderweitig beschÃ¤digt ist, schaue dir bitte unsere Wiki-"
 "Seite an, wie es zu melden ist."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Melde ein Sicherheitsproblem."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -933,11 +944,11 @@ msgstr ""
 "tor-security-sendkey@xxxxxxxxxxxxxxxxxxxx kontaktierst, oder von pool.sks-"
 "keyservers.net. Hier ist der Fingerabdruck:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Sende uns eine E-Mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -949,7 +960,7 @@ msgstr ""
 "bitte eine E-Mail an frontdesk@xxxxxxxxxxxxxxxxx. Bei spenderbezogenen "
 "Fragen Kontakt bitte an giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Sende uns eine E-Mail"
 
@@ -970,9 +981,8 @@ msgid "Go to Google Play"
 msgstr "Gehe zu Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Gehe zu F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1101,8 +1111,8 @@ msgid "Download in another language or platform"
 msgstr "Herunterladen in einer anderen Sprache oder Plattform"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Erweiterte Installations-Optionen"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1244,7 +1254,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Das Tor Project | PrivatsphÃ¤re & Freiheit Online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-Projekt"
 
@@ -1406,7 +1416,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Nutze deine FÃ¤higkeiten um freiwillig mitzuhelfen."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser-Handbuch"
 
@@ -1414,6 +1424,22 @@ msgstr "Tor Browser-Handbuch"
 msgid "Read more."
 msgstr "Mehr dazu erfÃ¤hrst du hier."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Mitwirkende an dieser Seite:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Bearbeite diese Seite"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Feedback vorschlagen"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "PDF anzeigen"
diff --git a/contents+el.po b/contents+el.po
index 0b2972379..d3240c948 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -98,6 +98,8 @@ msgstr "Î§Î¿Ï?Î·Î³Î¿Î¯"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -191,8 +193,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -594,10 +596,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Î?Î±Ï?ÎµÎ²Î¬Ï?Ï?Îµ Ï?Î¿Î½ Tor Browser"
 
@@ -645,7 +652,7 @@ msgstr ""
 "Î¤Î± Ï?Î®Î¼Î±Ï?Î± ÎºÎ±Ï?Î±Ï?ÎµÎ¸ÎÎ½, Î¿Î¹ Ï?Ï?Î¿Î¹ Ï?Î½ÎµÏ?Î¼Î±Ï?Î¹ÎºÏ?Î½ Î´Î¹ÎºÎ±Î¹Ï?Î¼Î¬Ï?Î½ ÎºÎ±Î¹ Î¿Î¹ ÎºÎ±Î½Ï?Î½ÎµÏ? Ï?ÎµÏ?Î¯ "
 "Ï?Ï?Î®Ï?Î·Ï? Ï?Î¿Ï?Ï? Î±Ï?Ï? Ï?Ï?Î¯Ï?Î¿Ï?Ï? Î¼Ï?Î¿Ï?Î¿Ï?Î½ Î½Î± Î²Ï?ÎµÎ¸Î¿Ï?Î½ ÎµÎ´Ï? %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Î?ÎµÎ½Î¿Ï?"
 
@@ -666,9 +673,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -676,30 +681,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Î?Ï?Ï?Î¿Î»Î·Î¸ÎµÎ¯Ï?Îµ"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -707,32 +725,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -741,11 +759,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -753,7 +771,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -774,8 +792,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -886,7 +903,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1007,7 +1024,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1152,7 +1169,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1160,6 +1177,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+en_GB.po b/contents+en_GB.po
index a06681ce2..6afa92755 100644
--- a/contents+en_GB.po
+++ b/contents+en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>, 2019\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+eo.po b/contents+eo.po
index 58931ac2a..b1d67826e 100644
--- a/contents+eo.po
+++ b/contents+eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Esperanto (https://www.transifex.com/otf/teams/1519/eo/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Projektas"
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+es-AR.po b/contents+es-AR.po
index 7acc27e57..7c3c72aeb 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -2,14 +2,15 @@
 # ezemelano <melanoeze@xxxxxxxxx>, 2019
 # erinm, 2019
 # Zuhualime Akoochimoya, 2019
+# JoaquÃn Serna, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Zuhualime Akoochimoya, 2019\n"
+"Last-Translator: JoaquÃn Serna, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,6 +100,8 @@ msgstr "Auspiciantes"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -198,14 +201,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Por favor, solamente descargÃ¡ una versiÃ³n alfa si no tenÃ©s problemas con que"
-" algunas cosas no funcionen apropiadamente, o querÃ©s ayudarnos a encontrar y"
-" [reportar "
-"defectos](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" y no representa un riesgo para vos.."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -656,10 +654,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Descargar el Navegador Tor"
 
@@ -700,7 +703,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃº"
 
@@ -721,9 +724,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -731,30 +732,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -762,32 +776,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -796,11 +810,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -808,7 +822,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -829,8 +843,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -941,7 +954,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1062,7 +1075,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Proyecto Tor"
 
@@ -1207,7 +1220,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1215,6 +1228,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Link permanente"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+es.po b/contents+es.po
index c724196f1..840690f53 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -103,6 +103,8 @@ msgstr "Patrocinadores"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -203,13 +205,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Descarga un alfa sÃ³lo si estÃ¡s de acuerdo con que algunas cosas no funcionen"
-" correctamente, deseas ayudarnos a encontrar e [informar de "
-"errores](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" y no te arriesgues."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -730,10 +728,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";> nuestro "
 "directorio de distribuciÃ³n </a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Descargar Tor Browser"
 
@@ -782,7 +785,7 @@ msgstr ""
 "Se pueden encontrar, la marca registrada, las notas de derechos de autor, y "
 "las reglas de uso por terceras partes, en nuestra %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃº"
 
@@ -805,42 +808,51 @@ msgstr ""
 "bienvenidas."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discutir tÃ³picos relacionados con organizaciÃ³n y comunidad: encuentros, "
-"extensiÃ³n, traducciÃ³n o mejoras al sitio web."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Mirar o unirse a encuentros grupales registrados pÃºblicamente."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discutir la ejecuciÃ³n de un repetidor Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Hablar con la comunidad global austral de Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "EncuÃ©ntranos en las Redes Sociales"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Ser voluntario con Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "ImplÃcate"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Unirse a una lista de correo electrÃ³nico"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -853,11 +865,11 @@ msgstr ""
 "puedes hacerla a la lista apropiada. TambiÃ©n eres bienvenido a suscribir y "
 "sÃ³lo mirar, :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Reportar un error o hacer un comentario."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -868,11 +880,11 @@ msgstr ""
 "comentarios son extremadamente valiosos para nosotros (y para todos los "
 "usuarios de Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "CuÃ©ntanos acerca de un repetidor malicioso."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -881,11 +893,11 @@ msgstr ""
 "configurado, o de otra manera mal implementado, por favor comprueba nuestra "
 "pÃ¡gina wiki y publicaciones blog acerca de cÃ³mo reportarlo."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Reportar un problema de seguridad."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -900,11 +912,11 @@ msgstr ""
 "security-sendkey@xxxxxxxxxxxxxxxxxxxx o desde pool.sks-keyservers.net. AquÃ "
 "estÃ¡ la huella dactilar:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "EnvÃanos un correo electrÃ³nico"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -917,7 +929,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx. Por cuestiones relacionadas con donaciones, "
 "contactar giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "EnvÃanos Correo"
 
@@ -938,9 +950,8 @@ msgid "Go to Google Play"
 msgstr "Ir a Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Ir a F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1066,8 +1077,8 @@ msgid "Download in another language or platform"
 msgstr "Descargar en otro idioma o plataforma"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Opciones avanzadas de instalaciÃ³n"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1208,7 +1219,7 @@ msgstr "Te invitamos a unÃrtenos en IRC para saber cÃ³mo puedes involucrarte."
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "El Proyecto Tor | Privacidad & Libertad en lÃnea"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1369,7 +1380,7 @@ msgstr "Ejecuta un repetidor para hacer la red mÃ¡s rÃ¡pida y descentralizada."
 msgid "Use your skills to volunteer."
 msgstr "Usa tus habilidades y ofrÃ©cete como voluntario."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Manual del Tor Browser"
 
@@ -1377,6 +1388,22 @@ msgstr "Manual del Tor Browser"
 msgid "Read more."
 msgstr "Leer mÃ¡s."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Edita esta pÃ¡gina"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Sugiere cambios"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Ver PDF"
diff --git a/contents+et.po b/contents+et.po
index 74ec1a644..cf6c757cb 100644
--- a/contents+et.po
+++ b/contents+et.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n"
@@ -91,6 +91,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃ¼Ã¼"
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projekt Tor"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+eu.po b/contents+eu.po
index 87290a075..d329f5992 100644
--- a/contents+eu.po
+++ b/contents+eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Osoitz <oelkoro@xxxxxxxxx>, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/otf/teams/1519/eu/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor proiektua | Pribatutasuna eta askatasuna sarean"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+fa.po b/contents+fa.po
index df249f0f5..7236558e2 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -7,16 +7,16 @@
 # Emma Peel, 2019
 # Goudarz Jafari <goudarz.jafari@xxxxxxxxx>, 2019
 # Reza Ghasemi, 2019
-# Vox, 2019
 # MYZJ, 2019
+# Vox, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: MYZJ, 2019\n"
+"Last-Translator: Vox, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,6 +104,8 @@ msgstr "ØØ§Ù?Û?Ø§Ù?"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -203,13 +205,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Ù?Ø·Ù?Ø§ Ù?Ù?Ø· Ø¢Ù?Ù?Ø§ Ø±Ø§ Ø¯Ø§Ù?Ù?Ù?Ø¯ Ú©Ù?Û?Ø¯ Ø§Ú¯Ø± Ø´Ù?Ø§ Ø¨Ø§ Ø¨Ø±Ø®Û? Ø§Ø² Ú?Û?Ø²Ù?Ø§Û?Û? Ú©Ù? Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ú©Ø§Ø± "
-"Ù?Ù?Û?â??Ú©Ù?Ù?Ø¯Ø? Ù?Û?â??Ø®Ù?Ø§Ù?Û?Ø¯ Ø¨Ù? Ù¾Û?Ø¯Ø§ Ú©Ø±Ø¯Ù? Ù? [Ú¯Ø²Ø§Ø±Ø´ "
-"Ø§Ø´Ú©Ø§Ù?Ø§Øª](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)"
-" Ú©Ù?Ú© Ú©Ù?Û?Ø¯ Ù? Ø®Ù?Ø¯ Ø±Ø§ Ø¯Ø± Ù?Ø¹Ø±Ø¶ Ø®Ø·Ø± Ù?Ø±Ø§Ø± Ù?Ø¯Ù?Û?Ø¯."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -614,10 +612,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Ø¯Ø§Ù?Ù?Ù?Ø¯ Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±"
 
@@ -666,7 +669,7 @@ msgstr ""
 "Ù?Ø´Ø§Ù? ØªØ¬Ø§Ø±Û?Ø? Ø§Ø·Ù?Ø§Ø¹Û?Ù?â??Ù?Ø§Û? Ú©Ù¾Û? Ø±Ø§Û?Øª Ù? Ù?Ù?Ø§Ù?Û?Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø¨Ø±Ø§Û? Ø·Ø±Ù?Û?Ù? Ø«Ø§Ù?Ø« Ø¯Ø± "
 "%(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Ù?Ù?Ù?"
 
@@ -687,9 +690,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -697,30 +698,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -728,32 +742,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -762,11 +776,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -774,7 +788,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -795,8 +809,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -907,7 +920,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1028,7 +1041,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ù¾Ø±Ù?Ú?Ù? ØªÙ?Ø±"
 
@@ -1173,7 +1186,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1181,6 +1194,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Ø´Ø±Ú©Øª Ú©Ù?Ù?Ø¯Ú¯Ø§Ù? Ø¯Ø± Ø§Û?Ù? ØµÙ?ØÙ?"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Ù?Û?Ø±Ø§Û?Ø´ Ø§Û?Ù? ØµÙ?ØÙ?"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Ù¾Û?Ø´Ù?Ù?Ø§Ø¯ Ø¨Ø§Ø²Ø®Ù?Ø±Ø¯"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Ù¾Û?Ù?Ù?Ø¯ Ø¯Ø§Ø¦Ù?Û?"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+fi.po b/contents+fi.po
index 309922f2a..0f5f00c53 100644
--- a/contents+fi.po
+++ b/contents+fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Panu Ahvenharju, 2019\n"
 "Language-Team: Finnish (https://www.transifex.com/otf/teams/1519/fi/)\n"
@@ -98,6 +98,8 @@ msgstr "Sponsorit"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -197,13 +199,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Lataa alfa-versio vain jos hyvÃ¤ksyt, ettÃ¤ jotkut asiat eivÃ¤t toimi "
-"moitteettomasti ja haluat auttaa meitÃ¤ lÃ¶ytÃ¤mÃ¤Ã¤n ja [ilmoittamaan vioista] "
-"(https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-"Â ja kun et saata itseÃ¤si alttiiksi riskille."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -637,10 +635,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -681,7 +684,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Valikko"
 
@@ -702,9 +705,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -712,30 +713,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "LÃ¶ydÃ¤ meidÃ¤t sosiaalisesta mediasta"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Liity sÃ¤hkÃ¶postilistalle"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -743,32 +757,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Ilmoita viasta tai anna palautetta."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Ilmoita turvapulmasta."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -777,11 +791,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "LÃ¤hetÃ¤ meille sÃ¤hkÃ¶postia"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -789,7 +803,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "LÃ¤hetÃ¤ meille sÃ¤hkÃ¶postia"
 
@@ -810,8 +824,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -923,8 +936,8 @@ msgid "Download in another language or platform"
 msgstr "Lataa toisella kielellÃ¤ tai alustalla"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "LisÃ¤valitsimet asennukseen"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1044,7 +1057,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-projekti"
 
@@ -1195,7 +1208,7 @@ msgstr "Suorita reititintÃ¤ tehdÃ¤ksesi verkostosta nopeampi ja hajautetumpi."
 msgid "Use your skills to volunteer."
 msgstr "KÃ¤ytÃ¤ taitojasi vapaaehtoistyÃ¶ssÃ¤."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor-selaimen kÃ¤yttÃ¤jÃ¤opas"
 
@@ -1203,6 +1216,22 @@ msgstr "Tor-selaimen kÃ¤yttÃ¤jÃ¤opas"
 msgid "Read more."
 msgstr "Lue lisÃ¤Ã¤."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Katso PDF-tiedostoa"
diff --git a/contents+fr.po b/contents+fr.po
index a8be8fe52..2e0871ab4 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1,18 +1,18 @@
 # Translators:
 # Martus Translations <translations@xxxxxxxxxx>, 2019
 # ducki2p <ducki2p@xxxxxxxxx>, 2019
-# Emma Peel, 2019
 # Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2019
 # erinm, 2019
 # AO <ao@xxxxxxxxxxxxxxxxxxx>, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>, 2019\n"
+"Last-Translator: Emma Peel, 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"
@@ -105,6 +105,8 @@ msgstr "Commanditaires"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -207,14 +209,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Ne tÃ©lÃ©chargez une version alpha que si vous acceptez que certaines choses "
-"ne pas fonctionnent correctement, que vous souhaitez nous aider Ã  trouver et"
-" Ã  [signaler des "
-"bogues](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" et que vous ne vous exposez Ã  aucun risque."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -780,10 +777,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a12/\";>rÃ©pertoire de "
 "distribution.</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "TÃ©lÃ©charger le NavigateurÂ Tor"
 
@@ -836,7 +838,7 @@ msgstr ""
 "Les avis de marque de commerce, de droit dâ??auteur et les rÃ¨gles "
 "dâ??utilisation par des tiers se trouvent dans notre %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -858,43 +860,51 @@ msgstr ""
 "Discutez du codage et des protocoles de Tor. Les idÃ©es sont les bienvenues."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discutez des sujets connexes Ã  lâ??organisation et Ã  la communautÃ©Â : les "
-"rencontres, la sensibilisation, la traduction et les amÃ©liorations du site "
-"Web."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Consultez ou joignez-vous aux rencontres dâ??Ã©quipe publiques."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discutez de lâ??exploitation dâ??un relaisÂ Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Discutez avec la communautÃ© Tor de lâ??hÃ©misphÃ¨re Sud."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Trouvez-nous sur les mÃ©dias sociaux"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Faire du bÃ©nÃ©volat auprÃ¨s de Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Sâ??impliquer"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Se joindre Ã  une liste de diffusion"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -907,11 +917,11 @@ msgstr ""
 "dâ??assistance, vous pouvez la poser Ã  la liste appropriÃ©e. Vous Ãªtes invitÃ© Ã "
 " vous abonner ou autrement Ã  juste regarder :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Signaler un bogue ou laisser une rÃ©troaction."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -922,11 +932,11 @@ msgstr ""
 "vos rÃ©troactions sont inestimables pour nous (et pour tous les utilisateurs "
 "de Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Nous informer dâ??un mauvais relais."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -935,11 +945,11 @@ msgstr ""
 " autrement non fonctionnel, veuillez consulter la page de notre wiki et "
 "notre article de blogue pour savoir comment le signaler."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Signaler un problÃ¨me de sÃ©curitÃ©."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -954,11 +964,11 @@ msgstr ""
 "security-sendkey@xxxxxxxxxxxxxxxxxxxx ou sur pool.sks-keyservers.net. En "
 "voici lâ??empreinte numÃ©riqueÂ :"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Nous contacter par courriel"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -971,7 +981,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx. Pour toute question concernant les donateurs, "
 "veuillez contacter giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Nous contacter par courrier par postal"
 
@@ -992,9 +1002,8 @@ msgid "Go to Google Play"
 msgstr "Aller sur Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Aller sur F-Droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1123,8 +1132,8 @@ msgid "Download in another language or platform"
 msgstr "TÃ©lÃ©charger dans une langue ou pour une plateforme diffÃ©rente"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Options avancÃ©es dâ??installation"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1268,7 +1277,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Le ProjetÂ Tor | ConfidentialitÃ© et libertÃ© sur Internet"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Le ProjetÂ Tor"
 
@@ -1432,7 +1441,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Mettre vos talents Ã  contribution pour faire du bÃ©nÃ©volat."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Guide dâ??utilisation du NavigateurÂ Tor"
 
@@ -1440,6 +1449,22 @@ msgstr "Guide dâ??utilisation du NavigateurÂ Tor"
 msgid "Read more."
 msgstr "En savoir plus."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Ont contribuÃ© Ã  cette pageÂ :"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Modifier cette page"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Laisser une rÃ©troaction"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalien"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Visualiser le PDF"
diff --git a/contents+ga.po b/contents+ga.po
index a07e47924..6b052d5f1 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Ã?oslÃ³dÃ¡il BrabhsÃ¡laÃ Tor"
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "RoghchlÃ¡r"
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tionscadal Tor"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Buan-nasc"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+gl.po b/contents+gl.po
index 38616b5fa..111c96310 100644
--- a/contents+gl.po
+++ b/contents+gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Pilar FernÃ¡ndez Pazos <pfernandez@xxxxxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Galician (https://www.transifex.com/otf/teams/1519/gl/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+he.po b/contents+he.po
index 734d8d40a..9cb83c895 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -2,16 +2,16 @@
 # zxcsd <jenisjpl@xxxxxxxxx>, 2019
 # ereznet <support@xxxxxxxxxxxxx>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # ION, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: ION, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,6 +91,8 @@ msgstr "× ×?×ª× ×? ×?×¡×?×ª"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -190,8 +192,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -593,10 +595,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "×?×?×¨×? ×?×ª ×?×¤×?×¤×? Tor"
 
@@ -637,7 +644,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "×ª×¤×¨×?×?"
 
@@ -658,9 +665,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -668,30 +673,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "×?×¦×? ×?×?×ª× ×? ×?×?×?×?×? ×?×?×¨×ª×?×ª"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "×?×?×?×? ×?×¢×?×¨×?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "×?×¦×?×¨×£ ×?×? ×¨×©×?×?×ª ×?×?×?\"×?×?×?"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -699,32 +717,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "×?×?×?×? ×¢×? ×ª×§×? ×?×? ×ª×? ×?×©×?×?."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "×?×?×?×? ×¢×? ×¡×?×?×?×?×ª ×?×?×?×?×?."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -733,11 +751,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "×©×?×? ×?× ×? ×?×?×?\"×?"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -745,7 +763,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "×©×?×? ×?× ×? ×?×?×?×¨"
 
@@ -766,9 +784,8 @@ msgid "Go to Google Play"
 msgstr "×?×? ×?×? Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "×?×? ×?×? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -878,8 +895,8 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "×?×¤×©×¨×?×?×?×ª ×?×ª×§× ×? ×?×ª×§×?×?×?×ª"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -999,7 +1016,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "×?×?×?×? Tor"
 
@@ -1144,7 +1161,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1152,6 +1169,22 @@ msgstr ""
 msgid "Read more."
 msgstr "×§×¨×? ×¢×?×?."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "×§×?×©×?×¨ ×§×?×?×¢"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "×?×¦×? PDF"
diff --git a/contents+hi.po b/contents+hi.po
index 2a15199d4..6d2523828 100644
--- a/contents+hi.po
+++ b/contents+hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Manav Garg <garg.manav8@xxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "à¤?à¤²à¤?à¤¨à¤¾"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "à¤?à¥?à¤°  à¤ªà¤°à¤¿à¤¯à¥?à¤?à¤¨à¤¾"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+hr.po b/contents+hr.po
index 4c6c0157a..8f4526248 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Kako preuzeti Tor Browser"
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+hu.po b/contents+hu.po
index 9d0b576a6..c15cd2529 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -1,16 +1,16 @@
 # Translators:
 # AdminLMH <lehetmashogy@xxxxxxxxxxx>, 2019
-# vargaviktor <viktor.varga@xxxxxxxxx>, 2019
 # erinm, 2019
 # IstvÃ¡n DÃ¡vid <istvandavid@xxxxxxxxxx>, 2019
+# vargaviktor <viktor.varga@xxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: IstvÃ¡n DÃ¡vid <istvandavid@xxxxxxxxxx>, 2019\n"
+"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,6 +90,8 @@ msgstr "TÃ¡mogatÃ³k"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor Browser letÃ¶ltÃ©se"
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃ¼"
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "PDF megtekintÃ©se"
diff --git a/contents+id.po b/contents+id.po
index 2cb0d2359..1cde3ba49 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -4,16 +4,16 @@
 # erinm, 2019
 # Robert Dafis <robertdafis@xxxxxxxxx>, 2019
 # ical, 2019
-# Emma Peel, 2019
 # Cadas Propopuli Azzam Baribin <cadas.propopuli@xxxxxxxxx>, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Cadas Propopuli Azzam Baribin <cadas.propopuli@xxxxxxxxx>, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -101,6 +101,8 @@ msgstr "Sponsor"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -200,14 +202,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Mohon hanya mengunduh sebuah alpha jika Anda baik-baik saja dengan beberapa "
-"hal tidak bekerja dengan benar, ingin membantu kami menemukan dan "
-"[melaporkan "
-"bug](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" dan tidak menempatkan diri Anda dalam resiko."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -700,10 +697,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Unduh Tor Browser"
 
@@ -752,7 +754,7 @@ msgstr ""
 "Merek dagang, pemberitahuan hak cipta, dan peraturan untuk digunakan oleh "
 "pihak ketiga dapat ditemukan pada kami %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -773,12 +775,8 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "Diskusikan pengkodean dan protokol terkait Tor. Ide-ide dipersilakan."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Diskusikan topik mengenai organisasi dan komunitas: pertemuan, penjangkauan,"
-" penerjemahan, atau perbaikan situs web."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
@@ -786,30 +784,43 @@ msgstr ""
 "Saksikan atau bergabung dalam pertemuan tim yang dicatat secara publik."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Diskusi tentang menjalankan sebuah relai Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Temukan kami di Media Sosial"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Ikut Terlibat"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -822,11 +833,11 @@ msgstr ""
 " milis yang sesuai. Anda dipersilakan untuk berlangganan dan juga hanya "
 "menyaksikan :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Laporkan sebuah bug atau memberikan umpan balik."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -836,21 +847,21 @@ msgstr ""
 "untuk membantu meningkatkan perangkat lunak dan sumber daya kami, jadi umpan"
 " balik Anda sangat berharga untuk kami (dan untuk semua pengguna Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Beritahu kami tentang sebuah relai yang buruk."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Laporkan isu keamanan."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -859,11 +870,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -871,7 +882,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -892,9 +903,8 @@ msgid "Go to Google Play"
 msgstr "Pergi ke Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Pergi ke F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1012,7 +1022,7 @@ msgid "Download in another language or platform"
 msgstr "Unduh dalam bahasa atau platform lain"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1143,7 +1153,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Proyek Tor"
 
@@ -1294,7 +1304,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1302,6 +1312,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+is.po b/contents+is.po
index 7aa970673..8939a8a85 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,15 +1,15 @@
 # Translators:
 # erinm, 2019
-# Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2019
 # Emma Peel, 2019
+# Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2019\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,6 +99,8 @@ msgstr "StyrktaraÃ°ilar"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -200,13 +202,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Ekki vera aÃ° sÃ¦kja alfa-ÃºtgÃ¡funa nema Ã¾Ãº sÃ©rt sÃ¡tt/ur viÃ° aÃ° sumir hlutir "
-"virki ekki rÃ©tt, Ã¾Ãº viljir hjÃ¡lpa okkur aÃ° finna og [tilkynna "
-"villur](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" og sÃ©rt ekki aÃ° setja sjÃ¡lfa/n Ã¾ig Ã hÃ¦ttu."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -712,10 +710,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>dreifingarmÃ¶ppunni"
 " okkar</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "SÃ¦ktu Tor-vafrann"
 
@@ -767,7 +770,7 @@ msgstr ""
 "Athugasemdir varÃ°andi vÃ¶rumerki, hÃ¶fundarrÃ©tt, og reglur fyrir notkun "
 "utanaÃ°komandi aÃ°ila er hÃ¦gt aÃ° skoÃ°a Ã %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Valmynd"
 
@@ -788,42 +791,51 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "SpjallaÃ°u um kÃ³Ã°a og samskiptastaÃ°la Tor. Allar hugmyndir velkomnar."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"RÃ¦ddu um efni tengd skipulagi og samfÃ©laginu: fundir, ÃºtbreiÃ°sla, Ã¾Ã½Ã°ingar "
-"eÃ°a endurbÃ¦tur Ã¡ vefsvÃ¦Ã°i."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "SkoÃ°aÃ°u eÃ°a fylgstu meÃ° opinberlega skrÃ¡settum fundum."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "SpjallaÃ°u um rekstur Ã¡ Tor-endurvarpa."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "TalaÃ°u viÃ° Ã¾Ã¡ttakendur Ã Tor-samfÃ©laginu Ã Ã¾rÃ³unarlÃ¶ndunum."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Finndu okkur Ã¡ samfÃ©lagsmiÃ°lum"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "BjÃ³du fram krafta Ã¾Ãna viÃ° Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Taka Ã¾Ã¡tt"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Gerstu Ã¡skrifandi aÃ° pÃ³stlista"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -836,11 +848,11 @@ msgstr ""
 " hennar Ã¡ viÃ°komandi pÃ³stlista. Ã?Ã©r er lÃka velkomiÃ° aÃ° skrÃ¡ Ã¾ig og bara "
 "fylgjast meÃ° :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Tilkynntu um villu eÃ°a gefÃ°u umsÃ¶gn."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -850,11 +862,11 @@ msgstr ""
 "aÃ° bÃ¦ta hugbÃºnaÃ°inn og allt Ã¾aÃ° sem styÃ°ur hann, Ã¾annig aÃ° svÃ¶run frÃ¡ Ã¾Ã©r "
 "getur haft umtalsvert gildi fyrir okkur (og alla notendur Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "SegÃ°u okkur frÃ¡ skemmdum endurvÃ¶rpum."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -863,11 +875,11 @@ msgstr ""
 "stilltur, eÃ°a bilaÃ°ur Ã¡ einhvern hÃ¡tt, Ã¾Ã¡ Ã¦ttirÃ°u aÃ° skoÃ°a wiki-vefinn okkar"
 " og bloggfÃ¦rslur um hvernig best sÃ© aÃ° tilkynna um slÃkt."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Tilkynntu um Ã¶ryggisvandamÃ¡l."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -882,11 +894,11 @@ msgstr ""
 "security-sendkey@xxxxxxxxxxxxxxxxxxxx eÃ°a fengiÃ° hann af pool.sks-"
 "keyservers.net. HÃ©r er fingrafariÃ°:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Sendu okkur tÃ¶lvupÃ³st"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -899,7 +911,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx. Fyrir spurningar tengdar fjÃ¡rframlÃ¶gum, hafÃ°u "
 "samband viÃ° giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Sendu okkur pÃ³st"
 
@@ -920,9 +932,8 @@ msgid "Go to Google Play"
 msgstr "Fara Ã¡ Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Fara Ã¡ F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1048,8 +1059,8 @@ msgid "Download in another language or platform"
 msgstr "SÃ¦kja Ã¡ Ã¶Ã°ru tungumÃ¡li eÃ°a fyrir annaÃ° stÃ½rikerfi"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Ã?tarlegir valkostir viÃ° uppsetningu"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1189,7 +1200,7 @@ msgstr "Komdu til liÃ°s viÃ° okkur Ã¡ IRC og sjÃ¡Ã°u hvernig Ã¾Ãº getur tekiÃ° 
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor-verkefniÃ° | EinkalÃf og frelsi Ã¡ netinu."
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-verkefniÃ°"
 
@@ -1349,7 +1360,7 @@ msgstr "KeyrÃ°u endurvarpa til aÃ° gera netkerfiÃ° hraÃ°virkara og dreifÃ°ara."
 msgid "Use your skills to volunteer."
 msgstr "NotaÃ°u hÃ¦fileika Ã¾Ãna til gerast sjÃ¡lfboÃ°aliÃ°i."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "NotendahandbÃ³k Tor-vafrans"
 
@@ -1357,6 +1368,22 @@ msgstr "NotendahandbÃ³k Tor-vafrans"
 msgid "Read more."
 msgstr "Lesa meira."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Varanlegur tengill"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "SkoÃ°a PDF"
diff --git a/contents+it.po b/contents+it.po
index 90424b0bc..ec47d3e73 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -9,15 +9,15 @@
 # francesco ercolani <erco99@xxxxxxx>, 2019
 # Random_R, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # Hiro 7 <hiro@xxxxxxxxxxxxxx>, 2019
+# Emma Peel, 2019
 # Gabriele <gabboxl0@xxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Gabriele <gabboxl0@xxxxxxxxx>, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
@@ -107,6 +107,8 @@ msgstr "Sponsor"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -206,13 +208,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Per favore, scarica una versione alpha solo se sai di aspettarti alcune cose"
-" che non funzionano adeguatamente, se vuoi aiutarci a trovare e [segnalare "
-"errori](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" e non metterai a rischio te stesso."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -712,10 +710,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>cartella di "
 "distribuzione</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Scarica Tor Browser"
 
@@ -764,7 +767,7 @@ msgstr ""
 "Marchio registrato, avvertenze sul copyright e regole per l'utilizzo da "
 "terzi possono essere trovati nel nostro %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -787,42 +790,51 @@ msgstr ""
 "ben accette."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discussione degli argomenti relativi all'organizzazione e alla community: "
-"incontri, sensibilizzazione, traduzioni, o migliorie del sito."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Guarda o partecipa alle riunioni del team registrate pubblicamente."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discussione per la gestione di un relay Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Parla con la community meridionale globale di Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Trovaci sui Social Media"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Volontario con Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Unisciti a noi!"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Iscriviti a una mailing list"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -834,11 +846,11 @@ msgstr ""
 "nostro portale di supporto, puoi chiedere alla lista appropriata. Sei il "
 "benvenuto ad iscriverti anche solo per guardare :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Segnala un bug o fornisci un feedback."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -848,11 +860,11 @@ msgstr ""
 "che ci aiutano a migliorare il nostro software e le risorse, quindi le tue "
 "opinioni sono estremamente preziose per noi (e per tutti gli utenti Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Parlaci riguardo ad un cattivo relay."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -861,11 +873,11 @@ msgstr ""
 "per favore controlla la nostra pagina wiki e il post sul blog su come "
 "segnalarlo."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Segnala un problema di sicurezza."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -880,11 +892,11 @@ msgstr ""
 "sendkey@xxxxxxxxxxxxxxxxxxxx oppure pool.sks-keyservers.net. Ecco "
 "l'impronta:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Mandaci un'email"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -896,7 +908,7 @@ msgstr ""
 "una e-mail a frontdesk@xxxxxxxxxxxxxxxxx. Per domande relative ai donatori, "
 "contatta giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Mandaci una lettera"
 
@@ -917,9 +929,8 @@ msgid "Go to Google Play"
 msgstr "Vai su Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Vai a F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1044,8 +1055,8 @@ msgid "Download in another language or platform"
 msgstr "Scarica in un'altra lingua o piattaforma"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Opzioni d'Installazione Avanzate"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1185,7 +1196,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Il Progetto Tor | Riservatezza e LibertÃ  Online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1344,7 +1355,7 @@ msgstr "Gestisci un relay per rendere la rete piÃ¹ veloce e decentralizzata."
 msgid "Use your skills to volunteer."
 msgstr "Usa le tue abilitÃ  per fare volontariato."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Manuale Browser Tor"
 
@@ -1352,6 +1363,22 @@ msgstr "Manuale Browser Tor"
 msgid "Read more."
 msgstr "Leggi di piÃ¹."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Contributori a questa pagina:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Modifica questa pagina"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Esprimi un Feedback"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Link permanente"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Visualizza PDF"
diff --git a/contents+ja.po b/contents+ja.po
index e17591284..364aa989f 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: ue zaeco, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -94,6 +94,8 @@ msgstr "æ?¯æ?´è??"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -187,8 +189,8 @@ msgstr "æ©?è?½ã?®ã??ã?¹ã??ã?¨ã??ã?°ã?®ç?ºè¦?ã?®ã??ã??ã??å®?å®?ç??ã?½ã??ã??ã?¦ã?§
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -593,10 +595,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor Browser ã??ã??ã?¦ã?³ã?ã?¼ã??"
 
@@ -638,7 +645,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr "å??æ¨?ã??è??ä½?æ¨©è¡¨ç¤ºã??ç¬¬ä¸?è??ã?«ã??ã??ä½¿ç?¨ã?®è¦?å®?ã?«ã?¤ã??ã?¦ã?¯ %(link_to_faq)s ã??ã??è¦§ã??ã? ã??ã??ã??"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "ã?¡ã??ã?¥ã?¼"
 
@@ -659,9 +666,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -669,30 +674,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "ã?½ã?¼ã?·ã?£ã?«ã?¡ã??ã?£ã?¢"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Tor ã?§ã??ã?©ã?³ã??ã?£ã?¢"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "å??å? ã??ã??ã??"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "ã?¡ã?¼ã?ªã?³ã?°ã?ªã?¹ã??ã?«å?¥ä¼?ã??ã??"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -700,32 +718,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -734,11 +752,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -746,7 +764,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -767,8 +785,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -884,8 +901,8 @@ msgid "Download in another language or platform"
 msgstr "ä»?ã?®è¨?èª?ã??ã??ã?©ã??ã??ã??ã?©ã?¼ã? ã?®ã??ã?¦ã?³ã?ã?¼ã??"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "è©³ç´°ã?¤ã?³ã?¹ã??ã?¼ã?«ã?ªã??ã?·ã?§ã?³"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1014,7 +1031,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "The Tor Project | ã?ªã?³ã?©ã?¤ã?³ã?§ã?®ã??ã?©ã?¤ã??ã?·ã?¼ã?¨è?ªç?±"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1159,7 +1176,7 @@ msgstr "ã?ªã?¬ã?¼ã??é??ç?¨ã??ã?¦ã??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã??é??ã??ã??ã??ã??é??
 msgid "Use your skills to volunteer."
 msgstr "ã??ã?©ã?³ã??ã?£ã?¢ã?«ã?¹ã?ã?«ã??æ´»ã??ã??ã??"
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser ã??ã??ã?¥ã?¢ã?«"
 
@@ -1167,6 +1184,22 @@ msgstr "Tor Browser ã??ã??ã?¥ã?¢ã?«"
 msgid "Read more."
 msgstr "è©³ç´°"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "PDF ã?®è¡¨ç¤º"
diff --git a/contents+ka.po b/contents+ka.po
index 332d938ac..54c949dbe 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Georgianization, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -100,6 +100,8 @@ msgstr "á??á??á??á?¤á??á??á??á??á?¡á??á??á??á??á??á??"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -202,13 +204,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"á??á??á?®á??á??á??, á??á?®á??á??á??á?? á??á?? á?¨á??á??á??á?®á??á??á??á??á?¨á?? á?©á??á??á??á?¢á??á??á? á??á??á?? alpha-á??á??á? á?¡á??á??, á??á?£ á?¨á??á??á??á?«á??á??á??á??á?? "
-"á?®á??á? á??á??á??á??á??á??á??á?? á??á??á??á??á??á??á??á??á??á?? á??á?? á??á?¡á?£á? á?? á??á??á?®á??á??á? á??á??á?? [á??á??á?®á?¡á??á??á??á??á??á??á??á?¡ "
-"á??á??á??á??á??á??á??á??á??á??á??](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" á??á??á??á?¡á??á??á?? á??á?£ á??á?  á??á??á??á??á? á??á??á??á??á??á?? á??á?¥á??á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -763,10 +761,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>á??á??á??á? á?ªá??á??á??á??á??á?¡ "
 "á?¬á?§á??á? á??á??á??á??</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??"
 
@@ -817,7 +820,7 @@ msgstr ""
 "á??á??á?¡á??á??á?? á??á?®á??á? á??á?¡ á?¡á??á??á??á?á? á?? á??á??á?¨á??á??á??á??á?¡, á?¡á??á??á??á?¢á??á? á?? á?¨á??á??á??á?¨á??á??á??á??á??á?¡á?? á??á?? á??á??á??á??á?§á??á??á??á??á??á?¡ "
 "á??á??á? á??á??á??á??á??á?¡ á?¨á??á?¡á??á?®á??á??, á??á?®á??á??á??á?? á?©á??á??á??á?? %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "á??á??á??á??á?£"
 
@@ -840,42 +843,51 @@ msgstr ""
 "á??á?®á??á??á?? á??á??á? á?? á??á??á?¡á??á?¡á??á??á??á??á??á??á??á??á??."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"á??á?¡á??á?£á??á? á??á?? á??á??á?¬á??á?¡á??á??á?£á??á??á??á??á?¡á?? á??á?? á??á? á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á?£á?? á?¡á??á??á??á??á?®á??á??á??á??: á?¨á??á?®á??á??á??á? á??á??á??á??, "
-"á??á??á?¤á??á? á??á??á??á??á??á??á??, á??á??á? á??á??á??á??á??á?? á??á?? á?¡á??á??á?¢á??á?¡ á??á??á??á??á??á??á??á? á??á??á??á??á??."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "á??á??á??á??á?? á??á??á??á??á??á??á?? á??á?? á?¨á??á??á??á?£á??á? á??á??á??á?? á??á?£á??á??á??á?¡ á?¡á??á?¯á??á? á??á?? á??á??á??á?¥á??á?£á?? á?¨á??á?®á??á??á??á? á??á??á?¡."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "á??á?¡á??á?£á??á? á??á?? Tor-á??á?¡ á??á??á??á??á??á?ªá??á??á??á?¡ á??á??á?¨á??á??á??á??á?¡ á?¨á??á?¡á??á?®á??á??"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "á??á??á??á?¡á??á?£á??á? á??á?? Tor-á??á?¡ á?¡á??á??á?®á? á??á??á??á?¡ á?¡á??á??á? á??á??á?¨á??á? á??á?¡á?? á??á? á??á??á??á??á?¡."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "á??á??á??á??á??á??á??á?? á?¡á??á?ªá??á??á??á?£á?  á?¥á?¡á??á??á?¨á??"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "á?¨á??á??á?¢á??á??á??á?? á?¬á??á??á??á??á?? Tor-á?¨á??"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "á?©á??á??á? á??á??á??"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "á?¨á??á??á??á?£á??á? á??á??á??á?? á??á??á?¤á??á?¡á?¢á??á?¡ á?¯á??á?£á?¤á?¡"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -888,11 +900,11 @@ msgstr ""
 "á??á??á?¡á??á??á?? á?¨á??á?¡á??á??á??á??á??á?¡ á?¯á??á?£á?¤á?¨á??. á??á?¡á??á??á??, á?¡á?£á? á??á??á??á??á?¡á??á??á??á??á? , á?¨á??á??á??á?«á??á??á??á?? á?£á??á? á??á??á??á?? á??á??á??á??á??á?¬á??á? á??á?? "
 "á??á?? á??á??á??á??á?? á??á??á??á??á??á??á??."
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "á??á??á??á??á??á?®á?¡á??á??á??á?? á?®á??á? á??á??á??á??á?¡ á?¨á??á?¡á??á?®á??á?? á??á?? á??á??á??á??á??á??á??á?®á??á??á?£á? á??á??."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -903,11 +915,11 @@ msgstr ""
 "á?¡á?®á??á??á??á??á?¡á?®á??á?? á?¡á??á?¨á?£á??á??á??á??á??á??á?¡, á??á?¡á?? á? á??á??, á??á?¥á??á??á??á?? á??á??á??á??á?®á??á??á?£á? á??á??á?? á??á??á?¢á??á?? á?¦á??á? á??á??á?£á??á??á?? "
 "á?©á??á??á??á??á??á??á?¡ (á??á?¡á??á??á?? á? á??á??á??á? á?ª, Tor-á??á?¡ á?§á??á??á??á?? á??á??á??á?®á??á??á? á??á??á??á??á?¡á??á??á??á?¡)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "á??á??á??á??á??á?®á?¡á??á??á??á?? á??á??á?£á??á??á? á??á??á??á?? á??á??á??á??á??á?ªá??á??á??á?¡ á?¨á??á?¡á??á?®á??á??."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -916,11 +928,11 @@ msgstr ""
 "á?¡á?®á??á??á??á??á??á? á?? á?®á??á? á??á??á??á??á?¡ á??á?¥á??á??á??á??, á??á??á?®á??á??á?? á??á??á??á??á?®á??á??á??á?? á?©á??á??á??á?¡ á??á??á??á??á?¡ á??á?? á?¡á??á??á?¢á?¡ á??á?? á??á?®á??á??á??á??, "
 "á? á??á??á??á?  á?®á??á??á??á?? á??á??á?®á?¡á??á??á??á??á??á?¡ á??á??á??á??á??á??á??á??á??á??."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "á??á??á??á??á??á?®á?¡á??á??á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á?¡á??á?¡á?£á?¡á?¢á??á??á??á??á?¡ á?¨á??á?¡á??á?®á??á??"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -935,11 +947,11 @@ msgstr ""
 " á??á?? pool.sks-keyservers.net-á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á??. á??á?¥á??á?? á??á?®á??á??á??á?? á??á??á??á??á??á??á??á??á??á??á?¡ "
 "á??á??á??á??á?¬á??á??á??á??á?¡ á??á??á??á??á?ªá??á??á??á??á??:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "á??á??á??á??á?¬á??á? á??á?? á??á??á?¤á??á?¡á?¢á??á??á??"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -952,7 +964,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx. á?¨á??á??á??á?¬á??á? á?£á??á??á??á??á??á??á?¡ á??á??á??á??á??á??á?? á??á?? á??á??á??á??á??á??á? á??á??á?? "
 "á??á??á?¡á??á??á??á? á??á??á?? giving@xxxxxxxxxxxxxx."
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "á??á??á??á??á?¬á??á? á??á?? á?¤á??á?¡á?¢á??á??"
 
@@ -973,9 +985,8 @@ msgid "Go to Google Play"
 msgstr "á??á?®á??á??á??á?? Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "á??á?®á??á??á??á?? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1098,8 +1109,8 @@ msgid "Download in another language or platform"
 msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? á?¡á?®á??á??á??á??á?¡á?®á??á?? á??á??á??á??á?¡á?? á??á?? á?¡á??á?¡á?¢á??á??á??á??á??á??"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "á?¡á?®á??á?? á?©á??á??á??á?¢á??á??á? á??á??á??á??á??"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1244,7 +1255,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor-á??á? á??á??á?¥á?¢á?? | á??á??á? á??á??á?£á??á??á??á?? á??á?? á??á??á??á??á?¡á?£á?¤á??á??á??á?? á??á??á?¢á??á? á??á??á?¢á?¨á??"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-á??á? á??á??á?¥á?¢á??"
 
@@ -1406,7 +1417,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "á??á??á??á??á??á?§á??á??á??á?? á??á?¥á??á??á??á?? á?£á??á??á? á??á??á?? á?¬á??á??á??á??á??á?¡ á?¨á??á?¡á??á?¢á??á??á??á??."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor-á??á? á??á?£á??á??á? á??á?¡ á?¡á??á?®á??á??á??á?«á?¦á??á??á??á??á??á??"
 
@@ -1414,6 +1425,22 @@ msgstr "Tor-á??á? á??á?£á??á??á? á??á?¡ á?¡á??á?®á??á??á??á?«á?¦á??á??á??á??á??
 msgid "Read more."
 msgstr "á??á? á?ªá??á??á??."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "á??á??á??á? á??á??á?¡ á?¨á??á?¥á??á??á??á?¨á?? á?¬á??á??á??á??á??á?¡ á?¨á??á??á?¢á??á??á??á??á??:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "á??á??á??á? á??á??á?¡ á?©á??á?¡á?¬á??á? á??á??á??"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "á??á??á??á??á?®á??á??á?£á? á??á??á??"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "á??á??á? á??á??á??á??á? á?? á??á??á?£á??á??"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "á??á?®á??á??á??á?? PDF"
diff --git a/contents+kk.po b/contents+kk.po
index 3d9139540..be841a17b 100644
--- a/contents+kk.po
+++ b/contents+kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Kazakh (https://www.transifex.com/otf/teams/1519/kk/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+km.po b/contents+km.po
index d21c0b739..7b97d303c 100644
--- a/contents+km.po
+++ b/contents+km.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Khmer (https://www.transifex.com/otf/teams/1519/km/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "á??á??á??á??á??á?? Tor"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ko.po b/contents+ko.po
index 3f5327143..0bd51f969 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -4,14 +4,15 @@
 # Emma Peel, 2019
 # Johnny Cho <popeye92@xxxxxxxxx>, 2019
 # erinm, 2019
+# park seungbin <parksengbin48@xxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: park seungbin <parksengbin48@xxxxxxxxx>, 2019\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,6 +96,8 @@ msgstr "ë??ì??ì£¼ì?  ë¶?ë?¤"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -190,12 +193,9 @@ msgstr "ì??ì ? ë²?ì ?ì?? ì??í??í?¸ì?¨ì?´ë¥¼ ì¶?ì??í??ê¸° ì ?ì?? ê¸°ë?¥ì?? í??ì?¤
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"ì?? ë??ì??í??ì§? ì??ë?? ê²?ì?´ ì??ì?´ë?? ê´?ì°®ê³ , "
-"[ë²?ê·¸ë¦¬í?¬í?¸](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)"
-" ë¡? ë??ì??ì£¼ê¸° ì??í??ì? ë?¤ë©´ ì??í?? ë²?ì ?ì?? ë?¤ì?´ë¡?ë??í??ì?ì??ì?¤. ê·¸ë ?ë?¤ê³ í?´ì?? ì??í??ì?? ë?¸ì¶?ë??ì?´ ì??ì§?ë?? ì??ì?µë??ë?¤."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -609,10 +609,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??"
 
@@ -655,7 +660,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr "ì??í??, ì ?ì??ê¶? ê³ ì§? ë°? ê·?ì¹?ì?? ì ?3ì??ì?? ì?¬ì?©ì?? ë??í?? ì ?ë³´ë??%(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "ë©?ë?´"
 
@@ -676,9 +681,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -686,30 +689,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Torë¡? ì??ì??ë´?ì?¬ ì°¸ì?¬"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "ì°¸ì?¬í??ê¸°"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "ì?´ë©?ì?¼ ë¦¬ì?¤í?¸ì?? ì°¸ì?¬í??ê¸°"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -717,32 +733,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "ë³´ì??ë¬¸ì ? ë³´ê³ í??ê¸°"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -751,11 +767,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "ì?´ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -763,7 +779,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
@@ -784,9 +800,8 @@ msgid "Go to Google Play"
 msgstr "êµ¬ê¸? í??ë ?ì?´ë¡? ê°?ê¸°"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "F-droid %së¡? ê°?ê¸°"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -896,8 +911,8 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "ì?¤ì¹? ê³ ê¸? ì?¤ì ?"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1017,7 +1032,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor í??ë¡?ì ?í?¸"
 
@@ -1162,7 +1177,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "ë?¹ì? ì?? ê¸°ì? ì?? ì?¬ì?©í??ì?¬ ì??ì?? ë´?ì?¬ë¥¼ í?©ì??ë?¤."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor ë¸?ë?¼ì?°ì ? ì?¤ëª?ì??"
 
@@ -1170,6 +1185,22 @@ msgstr "Tor ë¸?ë?¼ì?°ì ? ì?¤ëª?ì??"
 msgid "Read more."
 msgstr "ë?? ì?½ê¸°"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "ê³ ì? ë§?í?¬"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "PDFë¬¸ì??ë³´ê¸°"
diff --git a/contents+lt.po b/contents+lt.po
index 721948c34..7060b05bd 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -1,16 +1,16 @@
 # Translators:
-# Moo, 2019
 # Benas Buivydas <benas@xxxxxxxxxxxxx>, 2019
 # Tautvydas Å½., 2019
 # erinm, 2019
+# Moo, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Moo, 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,6 +91,8 @@ msgstr "RÄ?mÄ?jai"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Meniu"
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Savanoriaukite su Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Prisijunkite prie el. paÅ¡to sÄ?raÅ¡o"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,9 +778,8 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Eiti Ä¯ F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor projektas"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor NarÅ¡yklÄ?s vadovas"
 
@@ -1146,6 +1163,22 @@ msgstr "Tor NarÅ¡yklÄ?s vadovas"
 msgid "Read more."
 msgstr "Skaityti daugiau."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Pastovioji nuoroda"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Å½iÅ«rÄ?ti PDF"
diff --git a/contents+lv.po b/contents+lv.po
index 85858a18a..ae9d2d01b 100644
--- a/contents+lv.po
+++ b/contents+lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
@@ -89,6 +89,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "LejuplÄ?dÄ?t PÄ?rlÅ«ku Tor"
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projekts Tor"
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+mk.po b/contents+mk.po
index 287a912bb..bca46062e 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Matej Plavevski <matej.plavevski+github@xxxxxxxxx>, 2019\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
@@ -92,6 +92,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -185,8 +187,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -588,10 +590,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Ð?Ñ?ÐµÐ²Ð·ÐµÐ¼Ð¸ Tor Ð?Ñ?ÐµÐ»Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?"
 
@@ -632,7 +639,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -653,9 +660,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -663,30 +668,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -694,32 +712,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -728,11 +746,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -740,7 +758,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -761,8 +779,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -873,7 +890,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -994,7 +1011,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Browser"
 
@@ -1139,7 +1156,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1147,6 +1164,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Ð?Ñ?Ð¸Ð´Ð¾Ð½ÐµÑ?Ñ?Ð²Ð°Ñ?Ð¸ Ð½Ð° Ð¾Ð²Ð°Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Ð?Ñ?ÐµÐ´Ð»Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ml.po b/contents+ml.po
index 4dce4f68d..e09ce7a55 100644
--- a/contents+ml.po
+++ b/contents+ml.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: ameer pb <ameerpbekm@xxxxxxxxx>, 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
@@ -91,6 +91,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "à´?àµ?àµ¼ à´ªà´¦àµ?à´§à´¤à´¿ "
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ms.po b/contents+ms.po
index 3fdd4f97c..1b6b24d32 100644
--- a/contents+ms.po
+++ b/contents+ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: abuyop <abuyop@xxxxxxxxx>, 2019\n"
 "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -98,6 +98,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -198,13 +200,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Sila muat turun versi alfa sekiranya anda tidak kisah dengan kegagalan "
-"fungsi, mahu membantu kami untuk cari dari [laporkan "
-"pepijat](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" dan tidak membiarkan diri anda menghadapi risiko."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -708,10 +706,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>direktori "
 "distribusi</a> kami."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Muat Turun Pelayar Tor"
 
@@ -762,7 +765,7 @@ msgstr ""
 "Tanda dagangan, notis hak cipta, dan peraturan untuk kegunaan pihak ketiga "
 "boleh ditemui dalam %(link_to_faq)s kami"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -785,42 +788,51 @@ msgstr ""
 "alukan."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Berbincang tajuk-tajuk berkaitan organisasi dan komuniti: pertemuan, "
-"jerayawara, terjemahan, atau penambahbaikan laman sesawang."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Tonton atau sertai pertemuan-pertemuan pasukan dilog secara awam."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Berbincang pengoperasian geganti Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Berbual dengan komuniti selatan global Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Temui kami di Media Sosial"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Sukarela Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Sertai"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Sertai ke senarai mel"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -833,11 +845,11 @@ msgstr ""
 "menanya senarai berkenaan, Anda dialu-alukan melanggan dan menjadi pemantau "
 "atau penonton sahaja :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Lapor jika ada pepijat atau beri maklum balas."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -848,11 +860,11 @@ msgstr ""
 "maklum balas anda sangat bernilai kepada kami (dan juga kepada semua para "
 "pengguna Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Beritahu kami jika ada geganti bermasalah."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -861,11 +873,11 @@ msgstr ""
 "atau bermasalah, sila rujuk halaman wiki kami atau hantaran blog untuk "
 "ketahui cara melaporkannya."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Lapor jika ada masalah keselamatan."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -879,11 +891,11 @@ msgstr ""
 " menghubungi tor-security-sendkey@xxxxxxxxxxxxxxxxxxxx atau melalui pool"
 ".sks-keyservers.net. Cap jari ada di sini:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Emel kami"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -895,7 +907,7 @@ msgstr ""
 "kontrak, dll, sila emel kepada  frontdesk@xxxxxxxxxxxxxxxxx. Bagi pertanyaan"
 " berkaitaan-derma, sila hubungi giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Hantar Mel"
 
@@ -916,9 +928,8 @@ msgid "Go to Google Play"
 msgstr "Pergi ke Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Pergi ke F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1044,8 +1055,8 @@ msgid "Download in another language or platform"
 msgstr "Muat turun dalam bahasa atau platform lain"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Pilihan Pemasangan Lanjutan"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1188,7 +1199,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Projek Tor | Privasi & Kebebasan Atas Talian"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projek Tor"
 
@@ -1352,7 +1363,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Guna kemahiran anda untuk menjadi sukarela."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Panduan Pelayar Tor"
 
@@ -1360,6 +1371,22 @@ msgstr "Panduan Pelayar Tor"
 msgid "Read more."
 msgstr "Baca lagi,"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Pautan Kekal"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Lihat PDF"
diff --git a/contents+my.po b/contents+my.po
index af0ab4e99..c401a2bff 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+nb.po b/contents+nb.po
index 541fc927a..04c51f0cc 100644
--- a/contents+nb.po
+++ b/contents+nb.po
@@ -3,15 +3,15 @@
 # a356f726dcd9c475642ac26af10009cc, 2019
 # JÃ¸rgen Moen Isaksen <klokkefriken2@xxxxxxxxxxxxxx>, 2019
 # erinm, 2019
-# john martinsen <rsa@xxxxxxxxxxx>, 2019
+# 490cdfb601cecc09e36402222ad5913c, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: john martinsen <rsa@xxxxxxxxxxx>, 2019\n"
+"Last-Translator: 490cdfb601cecc09e36402222ad5913c, 2019\n"
 "Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/otf/teams/1519/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,6 +94,8 @@ msgstr "Sponsorer"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -187,8 +189,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -613,10 +615,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Last ned Tor Browser"
 
@@ -659,7 +666,7 @@ msgstr ""
 "Varemerke, merknader om opphavsrett, og regler for bruk av tredjepart finner"
 " du i vÃ¥rt %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Meny"
 
@@ -680,9 +687,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -690,30 +695,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Finn oss pÃ¥ Sosiale Medier"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Bli involvert"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Bli med pÃ¥ en e-postliste"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -725,32 +743,32 @@ msgstr ""
 "ikke er besvart pÃ¥ vÃ¥r stÃ¸tteportal, kan du spÃ¸rre den aktuelle listen. Du "
 "er velkommen til Ã¥ abonnere og bare se, ogsÃ¥ :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Rapporter en feil eller gi tilbakemelding."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Rapporter et sikkerhetsproblem."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -759,11 +777,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Send oss en e-post"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -771,7 +789,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Send oss Mail"
 
@@ -792,9 +810,8 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "GÃ¥ til F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -908,7 +925,7 @@ msgid "Download in another language or platform"
 msgstr "Last ned pÃ¥ et annet sprÃ¥k eller plattform"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1036,7 +1053,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-prosjektet"
 
@@ -1188,7 +1205,7 @@ msgstr "KjÃ¸r et relÃ© for Ã¥ gjÃ¸re nettverket raskere og mer desentralisert."
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Nettleser hÃ¥ndbok"
 
@@ -1196,6 +1213,22 @@ msgstr "Tor Nettleser hÃ¥ndbok"
 msgid "Read more."
 msgstr "Les mer."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Se PDF"
diff --git a/contents+nl.po b/contents+nl.po
index a311a7e7c..73e6572b9 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Meteor 0id, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -102,6 +102,8 @@ msgstr "Sponsors"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -201,14 +203,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Download alstublieft de alfa-versie uitsluitend als u er mee akkoord gaat "
-"dat sommige dingen niet goed werken, als u wilt helpen fouten te ontdekken "
-"en te "
-"[rapporteren](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)"
-" en als u zeker weet dat u door gebruik geen risico loopt."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -758,10 +755,15 @@ msgstr ""
 "alfa\">Tor Browser Project page</a> en ook op onze <a "
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>distributiemap</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
 
@@ -811,7 +813,7 @@ msgstr ""
 "Handelsmerk, auteursrecht-opmerkingen en regels voor gebruik door derde "
 "partijen kun je vinden in onze %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -834,42 +836,51 @@ msgstr ""
 "IdeeÃ«n zijn welkom."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Bespreek organisatie en gemeenschap gerelateerde onderwerpen: ontmoetingen, "
-"correspondentie, vertalingen of website-verbeteringen."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Kijk naar of doe mee aan publiekelijk vastgelegde team-ontmoetingen."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Bespreek het beschikbaar stellen van een Tor-relay"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Spreek met Tor's gemeenschap voor ontwikkelingslanden."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Vind ons op sociale media."
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Vrijwillig voor Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Doe mee"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Word lid van een e-mail lijst"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -882,11 +893,11 @@ msgstr ""
 "stellen in de daarvoor aangewezen e-maillijst. Het staat je ook vrij om je "
 "in te schrijven en mee te lezen. :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Rapporteer een fout of geef ons terugkoppeling."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -896,11 +907,11 @@ msgstr ""
 "vrijwilligers om te helpen onze software en  middelen te verbeteren, dus jou"
 " terugkoppeling is zeer waardevol voor ons (en voor alle Tor-gebruikers)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "breng ons op de hoogte over een slechte relay."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -909,11 +920,11 @@ msgstr ""
 "is geconfigureerd of op een andere manier niet werkt, lees dan alsjeblieft "
 "onze wiki-pagina en blogpost over hoe je dit rapporteert."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Rapporteer en beveiligingsprobleem."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -928,11 +939,11 @@ msgstr ""
 " met tor-security-sendkey@xxxxxxxxxxxxxxxxxxxx of van pool.sks-"
 "keyservers.net. Hier is de fingerprint:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Stuur ons een e-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -944,7 +955,7 @@ msgstr ""
 "stuur alstublieft een e-mail naar frontdesk@xxxxxxxxxxxxxxxxx. Voor donatie "
 "gerelateerde vragen, neem contact op met giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Stuur ons een brief"
 
@@ -965,9 +976,8 @@ msgid "Go to Google Play"
 msgstr "Ga naar Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Ga naar F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1094,8 +1104,8 @@ msgid "Download in another language or platform"
 msgstr "Download in een andere taal of voor een ander platform"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Geavanceerde installatie-opties"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1237,7 +1247,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Het Tor Project | Privacy & vrijheid on-line"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-project"
 
@@ -1399,7 +1409,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Gebruik je vaardigheden om te vrijwilligen."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser handleiding"
 
@@ -1407,6 +1417,22 @@ msgstr "Tor Browser handleiding"
 msgid "Read more."
 msgstr "Lees meer."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Geef ons terugkoppeling"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Bekijk PDF"
diff --git a/contents+nn.po b/contents+nn.po
index be26d1b50..6e90e4e2a 100644
--- a/contents+nn.po
+++ b/contents+nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: BjÃ¸rn I., 2019\n"
 "Language-Team: Norwegian Nynorsk (https://www.transifex.com/otf/teams/1519/nn/)\n"
@@ -89,6 +89,8 @@ msgstr "Sponsorar"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -182,8 +184,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -585,10 +587,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Last ned Tor-nettlesaren"
 
@@ -629,7 +636,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -650,9 +657,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -660,30 +665,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -691,32 +709,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -725,11 +743,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -737,7 +755,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -758,8 +776,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -870,7 +887,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -991,7 +1008,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-prosjektet"
 
@@ -1136,7 +1153,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1144,6 +1161,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+pl.po b/contents+pl.po
index 3a9fdae73..5577007f4 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -2,21 +2,21 @@
 # sebx, 2019
 # Marcin Januchta <marcin.januchta@xxxxxxxxx>, 2019
 # Verdulo :-), 2019
-# Dawid Job <hoek@xxxxxxx>, 2019
 # wigatesi, 2019
 # Filip <filipiczesio@xxxxx>, 2019
 # Dawid Potocki <dpot@xxxxxxxxxxx>, 2019
 # erinm, 2019
 # Waldemar Stoczkowski, 2019
 # Emma Peel, 2019
+# Dawid Job <hoek@xxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Dawid Job <hoek@xxxxxxx>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,6 +105,8 @@ msgstr "Sponsorzy"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -205,14 +207,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"ProszÄ? pobierz wydanie alpha tylko wtedy, gdy nie masz nic przeciwko temu, "
-"Å¼e niektÃ³re rzeczy mogÄ? nie dziaÅ?aÄ? prawidÅ?owo, chcesz nam pomÃ³c w "
-"znalezieniu i [zgÅ?oszeniu "
-"bÅ?Ä?dÃ³w](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" i nie naraÅ¼asz siÄ? na ryzyko."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -713,10 +710,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>katalogu "
 "dystrybucyjnego</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Pobierz przeglÄ?darkÄ? Tor"
 
@@ -765,7 +767,7 @@ msgstr ""
 "Znak towarowy, informacje o prawach autorskich i zasady korzystania z nich "
 "przez osoby trzecie moÅ¼na znaleÅºÄ? w naszym %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -788,42 +790,51 @@ msgstr ""
 "widziane."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Dyskutuj na tematy zwiÄ?zane z organizacjÄ? i spoÅ?ecznoÅ?ciÄ?: spotkania, "
-"kontakty zewnÄ?trzne, tÅ?umaczenie lub ulepszenia strony internetowej."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Obserwuj lub doÅ?Ä?cz do publicznie zarejestrowanych spotkaÅ? zespoÅ?u."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Porozmawiaj o uruchomieniu przekaÅºnika Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Porozmawiaj z globalnÄ? poÅ?udniowÄ? spoÅ?ecznoÅ?ciÄ? Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "ZnajdÅº nas w mediach spoÅ?ecznoÅ?ciowych"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Wolontariusz z Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "PrzyÅ?Ä?cz siÄ?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "DoÅ?Ä?cz do listy e-mail"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -836,11 +847,11 @@ msgstr ""
 "technicznej, moÅ¼esz zapytaÄ? na odpowiedniej liÅ?cie. Zapraszamy do "
 "subskrypcji jak i rÃ³wniez po prostu do oglÄ?dania :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "ZgÅ?oÅ? bÅ?Ä?d lub przeÅ?lij opiniÄ? zwrotnÄ?."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -850,11 +861,11 @@ msgstr ""
 "pomÃ³c udoskonaliÄ? nasze oprogramowanie i zasoby, wiÄ?c Twoja opinia jest "
 "niezwykle cenna dla nas (i dla wszystkich uÅ¼ytkownikÃ³w Tora)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Opowiedz nam o zÅ?ym przekaÅºniku."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -863,11 +874,11 @@ msgstr ""
 "skonfigurowany lub w inny sposÃ³b uszkodzony, sprawdÅº naszÄ? stronÄ? wiki i "
 "wpis na blogu, jak to zgÅ?osiÄ?."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "ZgÅ?oÅ? problem dotyczÄ?cy bezpieczeÅ?stwa."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -882,11 +893,11 @@ msgstr ""
 "sendkey@xxxxxxxxxxxxxxxxxxxx lub z pool.sks-keyservers.net. Oto cyfrowy "
 "odcisk palca:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Napisz do nas e-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -899,7 +910,7 @@ msgstr ""
 "przypadku pytaÅ? dotyczÄ?cych darczyÅ?cÃ³w prosimy o kontakt z "
 "giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "WyÅ?lij nam e-mail"
 
@@ -920,9 +931,8 @@ msgid "Go to Google Play"
 msgstr "PrzejdÅº do Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "PrzejdÅº do F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1051,8 +1061,8 @@ msgid "Download in another language or platform"
 msgstr "Pobierz w innym jÄ?zyku lub platformÄ?"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Opcje Instalacja Zaawansowana"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1194,7 +1204,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Projekt Tor | PrywatnoÅ?Ä? & WolnoÅ?Ä? Online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Project Tor"
 
@@ -1355,7 +1365,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Wykorzystaj swoje umiejÄ?tnoÅ?ci, aby zgÅ?osiÄ? siÄ? na ochotnika."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Instrukcja korzystania z Tor Browser"
 
@@ -1363,6 +1373,22 @@ msgstr "Instrukcja korzystania z Tor Browser"
 msgid "Read more."
 msgstr "Czytaj wiÄ?cej."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Zobacz PDF"
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 21840e1d1..7b32b9b20 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Chacal E., 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -111,6 +111,8 @@ msgstr "Patrocinadores"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -211,14 +213,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Por favor, baixe a versÃ£o alfa somente se vocÃª aceitar que algumas coisas "
-"talvez nÃ£o funcionem corretamente, quiser nos ajudar encontrando e "
-"[relatando "
-"problemas](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" e nÃ£o estiver colocando-se em risco."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -759,10 +756,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>diretÃ³rio de "
 "distribuiÃ§Ã£o</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Baixar Tor Browser"
 
@@ -811,7 +813,7 @@ msgstr ""
 "Marca registrada, avisos de direitos autorais, e regras de uso para "
 "terceiros podem ser encontradas em nosso %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -833,42 +835,51 @@ msgstr ""
 "Discuta cÃ³digos e protocolos relacionados ao Tor. Ideias sÃ£o bem-vindas."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discuta assuntos relacionados Ã  organizaÃ§Ã£o e Ã  comunidade: encontros, "
-"divulgaÃ§Ã£o, traduÃ§Ã£o ou melhorias no website."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Assista ou participe de reuniÃµes da equipe publicamente registradas."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discuta a operaÃ§Ã£o de um relay Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Fale com a comunidade do sul global do Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Encontre-nos nas MÃdias Sociais"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Seja um voluntÃ¡rio para o Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Envolva-se"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Junte-se Ã  nossa lista de emails"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -881,11 +892,11 @@ msgstr ""
 "pode dirigi-la Ã  lista apropriada. VocÃª tambÃ©m Ã© bem-vindo se quiser apenas "
 "assinar a lista e observar! :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Relate um bug ou sua experiÃªncia"
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -895,11 +906,11 @@ msgstr ""
 "ajudar-nos a melhorar nosso software e recursos, portanto, sua experiÃªncia Ã©"
 " extremamente valiosa para nÃ³s (e para todos os usuÃ¡rios do Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Avise-nos sobre um mau relay"
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -908,11 +919,11 @@ msgstr ""
 "outro modo, defeituoso, por favor confira nossa pÃ¡gina wiki e um artigo em "
 "nosso blog para saber como relatÃ¡-lo."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Relate um problema de seguranÃ§a"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -927,11 +938,11 @@ msgstr ""
 "security-sendkey@xxxxxxxxxxxxxxxxxxxx ou em pool.sks-keyservers.net. Eis a "
 "impressÃ£o digital:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Contacte-nos por e-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -944,7 +955,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx. Para consultas concernentes a doadores, "
 "contacte giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Envie-nos um e-mail"
 
@@ -965,9 +976,8 @@ msgid "Go to Google Play"
 msgstr "VÃ¡ para o Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "VÃ¡ para o F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1093,8 +1103,8 @@ msgid "Download in another language or platform"
 msgstr "Download em outro idioma ou plataforma"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "OpÃ§Ãµes AvanÃ§adas de InstalaÃ§Ã£o"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1235,7 +1245,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "O Projeto Tor | Privacidade e Liberdade Online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projeto Tor"
 
@@ -1395,7 +1405,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Use suas habilidades colaborar voluntariamente."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Manual do Navegador Tor"
 
@@ -1403,6 +1413,22 @@ msgstr "Manual do Navegador Tor"
 msgid "Read more."
 msgstr "Ler mais."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Contribuidores para esta pÃ¡gina:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Edite essa pÃ¡gina"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Sugerir Feedback"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Link permanente"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Ver PDF"
diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index 4d4ce6e85..57893f008 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -3,15 +3,15 @@
 # erinm, 2019
 # Rui Melo <viper5000pt@xxxxxxxxx>, 2019
 # Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019
-# Hugo9191 <hugoncosta@xxxxxxxxx>, 2019
 # Manuela Silva <inactive+h_manuela_rodsilva@xxxxxxxxxxxxx>, 2019
+# Hugo9191 <hugoncosta@xxxxxxxxx>, 2019
 # Rui <xymarior@xxxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Rui <xymarior@xxxxxxxxxx>, 2019\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
@@ -102,6 +102,8 @@ msgstr "Patrocinadores"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -202,13 +204,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Por favor, transfira apenas a versÃ£o alpha se nÃ£o tem problemas com algumas "
-"coisas nÃ£o funcionam corretamente, se estÃ¡ disposto a ajudar e a [reportar "
-"erros](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" e nÃ£o estÃ¡ a pÃ´r-se em risco."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -709,10 +707,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>diretoria de "
 "distribuiÃ§Ã£o</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Transferir o Tor Browser"
 
@@ -761,7 +764,7 @@ msgstr ""
 "As marcas comerciais, avisos de direitos de autor e regras de utilizaÃ§Ã£o por"
 " parte de terceiros podem ser encontradas em %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -784,42 +787,51 @@ msgstr ""
 "sÃ£o bem-vindas."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Discuta tÃ³picos relacionados com a organizaÃ§Ã£o e a comunidade: encontros, "
-"alcance, traduÃ§Ã£o ou melhoramentos do site."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Veja ou junte-se a encontros de equipa publicamente registados."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discuta sobre executar um retransmissor Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Fale com a comunidade global do sul do Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Encontre-nos nas redes sociais"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Voluntariado com o Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Participe"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Junte-se a uma lista de emails"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -831,11 +843,11 @@ msgstr ""
 "nÃ£o respondida no nosso portal de suporte, pode perguntar Ã  lista "
 "apropriada. Ã? tambÃ©m bem-vindo a subscrever e simplesmente ver tambÃ©m :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Reportar um erro ou dar a sua opiniÃ£o."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -845,11 +857,11 @@ msgstr ""
 "mundo para nos ajudar a melhorar o software e recursos, por isso a sua "
 "opiniÃ£o Ã© extremamente valiosa para nÃ³s (e para todos os utilizadores Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Avise-nos sobre um retransmissor mau."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -858,11 +870,11 @@ msgstr ""
 "configurado ou simplesmente estragado, por favor veja a nossa pÃ¡gina da wiki"
 " e a publicaÃ§Ã£o no blogue sobre como reportar."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Comunicar um problema de seguranÃ§a."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -877,11 +889,11 @@ msgstr ""
 "sendkey@xxxxxxxxxxxxxxxxxxxx ou atravÃ©s do pool.sks-keyservers.net. Aqui "
 "estÃ¡ a fingerprint:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Envie-nos um email"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -893,7 +905,7 @@ msgstr ""
 "favor envie um email para frontdesk@xxxxxxxxxxxxxxxxx. Para questÃµes "
 "relacionadas com doaÃ§Ãµes, contacte giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Envie-nos um Email"
 
@@ -914,9 +926,8 @@ msgid "Go to Google Play"
 msgstr "Ir ao Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Ir ao F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1040,8 +1051,8 @@ msgid "Download in another language or platform"
 msgstr "Transfira em outro idioma ou plataforma"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "OpÃ§Ãµes de instalaÃ§Ã£o avanÃ§adas"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1181,7 +1192,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "The Tor Project | Privacidade e Liberdade na Internet"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projeto Tor"
 
@@ -1342,7 +1353,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Use as suas habilidades para colaborar voluntariamente."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Manual do Tor Browser"
 
@@ -1350,6 +1361,22 @@ msgstr "Manual do Tor Browser"
 msgid "Read more."
 msgstr "Ler mais."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Colaboradores desta pÃ¡gina:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Editar esta pÃ¡gina"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Submeter ComentÃ¡rio"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "LigaÃ§Ã£o permanente"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Ver PDF"
diff --git a/contents+ro.po b/contents+ro.po
index ff51eca09..6553f86a1 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: eduard pintilie <eduard.pintilie@xxxxxxxxx>, 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -102,6 +102,8 @@ msgstr "Sponsori"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -203,14 +205,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"DescÄ?rcaÈ?i o versiune alfa È?i dacÄ? observaÈ?i cÄ? unele lucruri nu "
-"funcÈ?ioneazÄ? corespunzÄ?tor, vÄ? rugÄ?m sÄ? ne ajutaÈ?i sÄ? gÄ?sim È?i sÄ? [raportaÈ?i"
-" bug-"
-"uri](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" pentru a nu vÄ? pune Ã®n pericol."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -711,10 +708,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>directorul "
 "nostru de distribuire."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "DescÄ?rcare Tor Browser"
 
@@ -763,7 +765,7 @@ msgstr ""
 "Marca comercialÄ?, anunÈ?urile privind drepturile de autor È?i regulile de "
 "utilizare de cÄ?tre terÈ?i pot fi gÄ?site Ã®n site-ul nostru %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Meniu"
 
@@ -786,42 +788,51 @@ msgstr ""
 "binevenite."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"DiscutaÈ?i despre subiecte legate de organizaÈ?ie È?i de comunitate: Ã®ntÃ¢lniri,"
-" programe de informare, traduceri sau Ã®mbunÄ?tÄ?È?iri ale site-ului web."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "UrmÄ?riÈ?i sau participaÈ?i la Ã®ntÃ¢lniri ale echipei."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "DiscutaÈ?i despre funcÈ?ionarea unui releu Tor."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "VorbeÈ?te cu comunitatea localÄ? Tor."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "GÄ?siÈ?i-ne pe reÈ?elele de socializare"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Voluntar cu Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "ImplicaÈ?i-vÄ?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "ParticipaÈ?i la o listÄ? de e-mailuri"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -834,11 +845,11 @@ msgstr ""
 "puteÈ?i solicita lista corespunzÄ?toare. SunteÈ?i binevenit sÄ? vÄ? abonaÈ?i È?i sÄ?"
 " ne urmÄ?riÈ?i :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "RaportaÈ?i o eroare sau oferiÈ?i feedback."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -849,11 +860,11 @@ msgstr ""
 " feedbackul dvs. este extrem de important pentru noi (È?i pentru toÈ?i "
 "utilizatorii Tor)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "SpunÈ?i-ne despre un releu cu probleme."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -862,11 +873,11 @@ msgstr ""
 "configurat sau defect Ã®n alt mod, consultaÈ?i pagina noastrÄ? de wiki È?i "
 "postarea pe blog cu privire la modul de raportare a acestuia."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "RaportaÈ?i o problemÄ? de securitate."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -881,11 +892,11 @@ msgstr ""
 "sendkey@xxxxxxxxxxxxxxxxxxxx sau de la pool.sks-keyservers.net. IatÄ? "
 "amprenta:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Trimite-È?i-ne un e-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -897,7 +908,7 @@ msgstr ""
 "etc., vÄ? rugÄ?m sÄ? trimiteÈ?i un e-mail la frontdesk@xxxxxxxxxxxxxxxxx. Pentru"
 " Ã®ntrebÄ?ri legate de donator, contactaÈ?i d@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "TrimiteÈ?i-ne e-mail"
 
@@ -918,9 +929,8 @@ msgid "Go to Google Play"
 msgstr "AccesaÈ?i Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "AccesaÈ?i F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1045,8 +1055,8 @@ msgid "Download in another language or platform"
 msgstr "DescÄ?rcaÈ?i Ã®n altÄ? limbÄ? sau platformÄ?"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "OpÈ?iuni avansate de instalare"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1187,7 +1197,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Proiectul Tor | ConfidenÈ?ialitate È?i libertate online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Proiectul Tor"
 
@@ -1348,7 +1358,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "UtilizaÈ?i-vÄ? abilitÄ?È?ile pentru a vÄ? oferi ca voluntar."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Manualul Tor Browser"
 
@@ -1356,6 +1366,22 @@ msgstr "Manualul Tor Browser"
 msgid "Read more."
 msgstr "CitiÈ?i mai multe."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "VizualizaÈ?i fiÈ?ierul PDF"
diff --git a/contents+ru.po b/contents+ru.po
index d87f76cf3..0d4aa1da7 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
@@ -105,6 +105,8 @@ msgstr "Ð¡Ð¿Ð¾Ð½Ñ?Ð¾Ñ?Ñ?"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -204,14 +206,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?ÐºÐ°Ñ?Ð¸Ð²Ð°Ð¹Ñ?Ðµ Ð°Ð»Ñ?Ñ?Ð°-Ð²ÐµÑ?Ñ?Ð¸Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ñ?Ð¸ Ñ?Ñ?ÐµÑ? Ñ?Ñ?Ð»Ð¾Ð²Ð¸Ñ?Ñ?: 1) Ð²Ñ? Ð¾Ñ?Ð´Ð°ÐµÑ?Ðµ "
-"Ñ?ÐµÐ±Ðµ Ð¾Ñ?Ñ?ÐµÑ? Ð² Ñ?Ð¾Ð¼, Ñ?Ñ?Ð¾ Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð½Ðµ Ñ?Ð°Ðº, ÐºÐ°Ðº "
-"Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ?Ñ?Ñ?; 2) Ð²Ñ? Ñ?Ð¾Ð³Ð»Ð°Ñ?Ð°ÐµÑ?ÐµÑ?Ñ? Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ð½Ð°Ð¼ Ð¸Ñ?ÐºÐ°Ñ?Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ¸ Ð¸ [Ñ?Ð¾Ð¾Ð±Ñ?Ð°Ñ?Ñ? Ð¾ "
-"Ð½Ð¸Ñ?](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback);"
-" 3) Ð²Ñ? Ð½Ðµ Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ñ?ÐµÐ±Ñ? Ð² Ñ?Ð¸Ñ?ÐºÐ¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -713,10 +710,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð° "
 "Ñ?Ð°Ñ?Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Tor Browser"
 
@@ -765,7 +767,7 @@ msgstr ""
 "Ð? Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ð¹ Ð¼Ð°Ñ?ÐºÐµ, Ð°Ð²Ñ?Ð¾Ñ?Ñ?ÐºÐ¸Ñ? Ð¿Ñ?Ð°Ð²Ð°Ñ? Ð¸ Ñ?Ñ?Ð»Ð¾Ð²Ð¸Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð¿Ñ?Ð¾Ð´Ñ?ÐºÑ?Ð° "
 "Ñ?Ñ?ÐµÑ?Ñ?Ð¸Ð¼Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°Ð¼Ð¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð·Ð´ÐµÑ?Ñ?: %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Ð?ÐµÐ½Ñ?"
 
@@ -786,11 +788,8 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "Ð¾Ð±Ñ?Ñ?Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´Ð° Tor Ð¸ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð¾Ð² (Ð¸Ð´ÐµÐ¸ Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ñ?!)"
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"Ð¾Ð±Ñ?Ñ?Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¾Ñ?Ð³Ð²Ð¾Ð¿Ñ?Ð¾Ñ?Ð¾Ð²: Ð²Ñ?Ñ?Ñ?ÐµÑ?Ð¸, Ð¿Ñ?Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ðµ, Ð¿ÐµÑ?ÐµÐ²Ð¾Ð´Ñ?, Ñ?Ð»Ñ?Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ?Ð°"
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
@@ -798,30 +797,43 @@ msgstr ""
 "Ð½Ð°Ð±Ð»Ñ?Ð´Ð°Ð¹Ñ?Ðµ Ð·Ð° Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ð¼Ð¸ Ð²Ñ?Ñ?Ñ?ÐµÑ?Ð°Ð¼Ð¸ Ð½Ð°Ñ?ÐµÐ¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? (Ð¸Ð»Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾ÐµÐ´Ð¸Ð½Ñ?Ð¹Ñ?ÐµÑ?Ñ?!)"
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Ð²Ð¾Ð¿Ñ?Ð¾Ñ?Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¸ Ñ?Ð·Ð»Ð¾Ð² Tor"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "ÐºÐ°Ð½Ð°Ð» Ð´Ð»Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÑ?Ñ?Ð²Ð° Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¾Ð² \"Ð³Ð»Ð¾Ð±Ð°Ð»Ñ?Ð½Ð¾Ð³Ð¾ Ñ?Ð³Ð°\""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Ð?Ñ? Ð² Ñ?Ð¾Ñ?Ð¸Ð°Ð»Ñ?Ð½Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ñ?"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ? Ð²Ð¾Ð»Ð¾Ð½Ñ?ÐµÑ?Ð¾Ð¼ Ð² Ñ?ÐµÑ?Ð¸ Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¾ÐµÐ´Ð¸Ð½Ñ?Ð¹Ñ?ÐµÑ?Ñ?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ð°Ñ?Ñ?Ñ?Ð»ÐºÑ?"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -833,11 +845,11 @@ msgstr ""
 "Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¾Ð² Ð¸ Ð²Ñ? Ð½Ðµ Ð½Ð°Ñ?Ð»Ð¸ Ð¾Ñ?Ð²ÐµÑ? Ð½Ð° Ð?Ð¾Ñ?Ñ?Ð°Ð»Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÐ¸, Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ñ? ÐµÐ³Ð¾ Ð² "
 "Ñ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ñ?Ñ?Ñ?ÐµÐ¹ Ñ?Ð°Ñ?Ñ?Ñ?Ð»ÐºÐµ. Ð? Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼ Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ Ð¸Ð»Ð¸ Ñ?ÐµÐ¼-Ñ?Ð¾ ÐµÑ?Ðµ"
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -847,11 +859,11 @@ msgstr ""
 "Ð¼Ð¸Ñ?Ñ?. Ð?Ð½Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð°Ñ?Ñ? Ñ?Ð»Ñ?Ñ?Ñ?Ð°Ñ?Ñ? Ð½Ð°Ñ? Ð¿Ñ?Ð¾Ð´Ñ?ÐºÑ?. Ð?Ð±Ñ?Ð°Ñ?Ð½Ð°Ñ? Ñ?Ð²Ñ?Ð·Ñ? ÐºÑ?Ð°Ð¹Ð½Ðµ Ð²Ð°Ð¶Ð½Ð° Ð¸ Ð´Ð»Ñ? "
 "Ð½Ð°Ñ?, Ð¸ Ð´Ð»Ñ? Ð²Ñ?ÐµÑ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Tor."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ðµ Ð¾ Ð¿Ð»Ð¾Ñ?Ð¾Ð¼ Ñ?Ð·Ð»Ðµ"
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -860,11 +872,11 @@ msgstr ""
 " Ð¸Ð»Ð¸ Ð²Ñ?Ñ?ÐµÐ´Ñ?Ð¸Ð¼ Ð¸Ð· Ñ?Ñ?Ñ?Ð¾Ñ?, Ð¿Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ðµ Ð¾Ð± Ñ?Ñ?Ð¾Ð¼ (Ñ?Ð¼. Ð²Ð¸ÐºÐ¸-Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸ "
 "Ð±Ð»Ð¾Ð³)."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ðµ Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ðµ Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ñ?"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -879,11 +891,11 @@ msgstr ""
 "sendkey@xxxxxxxxxxxxxxxxxxxx Ð¸Ð»Ð¸ Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° pool.sks-keyservers.net). "
 "Ð?Ñ?Ð¿ÐµÑ?Ð°Ñ?Ð¾Ðº:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "E-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -895,7 +907,7 @@ msgstr ""
 "Ñ?.Ð´.) Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ: frontdesk@xxxxxxxxxxxxxxxxx. Ð?Ð¾ Ð²Ð¾Ð¿Ñ?Ð¾Ñ?Ð°Ð¼, "
 "Ñ?Ð²Ñ?Ð·Ð°Ð½Ð½Ñ?Ð¼ Ñ? Ð¿Ð¾Ð¶ÐµÑ?Ñ?Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ?Ð¼Ð¸, Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ: giving@xxxxxxxxxxxxxx."
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Ð?Ð´Ñ?ÐµÑ?"
 
@@ -916,9 +928,8 @@ msgid "Go to Google Play"
 msgstr "Ð?ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð² Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Ð?ÐµÑ?ÐµÐ¹Ñ?Ð¸ Ð² F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1043,8 +1054,8 @@ msgid "Download in another language or platform"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ðµ Ñ?Ð·Ñ?ÐºÐ¸ Ð¸ Ð¿Ð»Ð°Ñ?Ñ?Ð¾Ñ?Ð¼Ñ?"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¸ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÐ¸"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1178,7 +1189,7 @@ msgstr "Ð? Ñ?Ð¾Ð¼, ÐºÐ°Ðº Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?, Ð²Ñ? Ñ?Ð·Ð½Ð°ÐµÑ?Ðµ Ð² Ð½Ð°Ñ?
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor Project | Ð?Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ? Ð¸ Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð° Ð¾Ð½Ð»Ð°Ð¹Ð½"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ð?Ñ?Ð¾ÐµÐºÑ? Tor"
 
@@ -1337,7 +1348,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr "Ð¡Ñ?Ð°Ð½Ñ?Ñ?Ðµ Ð²Ð¾Ð»Ð¾Ð½Ñ?ÐµÑ?Ð¾Ð¼ Ð² Ð´Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð¾Ð»Ð¸."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Ð Ñ?ÐºÐ¾Ð²Ð¾Ð´Ñ?Ñ?Ð²Ð¾ Ð¿Ð¾ Tor Browser"
 
@@ -1345,6 +1356,22 @@ msgstr "Ð Ñ?ÐºÐ¾Ð²Ð¾Ð´Ñ?Ñ?Ð²Ð¾ Ð¿Ð¾ Tor Browser"
 msgid "Read more."
 msgstr "Ð§Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ð»Ñ?Ñ?Ðµ..."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð»ÐºÐ°"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?ÐµÑ?Ñ? PDF"
diff --git a/contents+sk.po b/contents+sk.po
index 0ad58cd75..050a349eb 100644
--- a/contents+sk.po
+++ b/contents+sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Lenka JeÅ¾kovÃ¡ <lenka.jezkova@xxxxxxxxxx>, 2019\n"
 "Language-Team: Slovak (https://www.transifex.com/otf/teams/1519/sk/)\n"
@@ -91,6 +91,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+sl.po b/contents+sl.po
index ba92768af..44f8f5db4 100644
--- a/contents+sl.po
+++ b/contents+sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Slovenian (https://www.transifex.com/otf/teams/1519/sl/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Projekt"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+sq.po b/contents+sq.po
index 157543875..6c8b6f0d2 100644
--- a/contents+sq.po
+++ b/contents+sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Besnik <besnik@xxxxxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Albanian (https://www.transifex.com/otf/teams/1519/sq/)\n"
@@ -90,6 +90,8 @@ msgstr "SponsorÃ«"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Projekti Tor"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+sr.po b/contents+sr.po
index fb0db4a7c..a202aeb80 100644
--- a/contents+sr.po
+++ b/contents+sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Aleksa RistiÄ?, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -96,6 +96,8 @@ msgstr "Sponzori"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -195,14 +197,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"Molimo Vas da preuzmete alfa verziju samo ako Vam je u redu da neke stvari "
-"ne funkcioniÅ¡u ispravno i ukoliko Å¾elite da nam pomognete da pronaÄ?emo "
-"greÅ¡ke {prijavi "
-"greÅ¡ke](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" i ne izlaÅ¾ite sebe riziku."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -607,10 +604,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Preuzmi Tor pregledaÄ?"
 
@@ -651,7 +653,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Meni"
 
@@ -672,9 +674,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -682,30 +682,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "NaÄ?i nas na druÅ¡tvenim medijima."
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Volontiraj sa Tor-om."
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "UkljuÄ?i se"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Pristupi e-mail listi"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -713,32 +726,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Prijavi greÅ¡ku ili nam pruÅ¾i povratne informacije."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Obavesti nas o loÅ¡em releju."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Prijavi bezbednosni problem."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -747,11 +760,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "PiÅ¡i nam e-mail"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -759,7 +772,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "PoÅ¡alji nam e-mail"
 
@@ -780,9 +793,8 @@ msgid "Go to Google Play"
 msgstr "Idi na Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Idi na F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -901,8 +913,8 @@ msgid "Download in another language or platform"
 msgstr "Preuzmi na drugom jeziku ili za drugu platformu."
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Napredne opcije instalacije"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1026,7 +1038,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor projekat | Online sloboda i privatnost"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Projekat"
 
@@ -1172,7 +1184,7 @@ msgstr "Pokreni relej kako bi mreÅ¾u uÄ?inio brÅ¾om i viÅ¡e decentralizovanom."
 msgid "Use your skills to volunteer."
 msgstr "Koristi svoje veÅ¡tine za volontiranje."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Uputstvo za Tor pregledaÄ?"
 
@@ -1180,6 +1192,22 @@ msgstr "Uputstvo za Tor pregledaÄ?"
 msgid "Read more."
 msgstr "ProÄ?itaj viÅ¡e."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "Pogledaj PDF"
diff --git a/contents+sv.po b/contents+sv.po
index 510d5d41c..09f8378e1 100644
--- a/contents+sv.po
+++ b/contents+sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -91,6 +91,8 @@ msgstr "Sponsorer"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor-projektet"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+sw.po b/contents+sw.po
index 81ae47add..1ee145006 100644
--- a/contents+sw.po
+++ b/contents+sw.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Zaituni Njovu <zaituni@xxxxxxxxxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n"
@@ -88,6 +88,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -181,8 +183,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -584,10 +586,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Pakua kivinjari cha Tor"
 
@@ -628,7 +635,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -649,9 +656,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -659,30 +664,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -690,32 +708,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -724,11 +742,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -736,7 +754,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -757,8 +775,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -869,7 +886,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -990,7 +1007,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Mradi wa Tor"
 
@@ -1135,7 +1152,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1143,6 +1160,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ta.po b/contents+ta.po
index 9b1648796..393cc62ed 100644
--- a/contents+ta.po
+++ b/contents+ta.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Bala Subramaniyan <balapandu222@xxxxxxxxxxx>, 2019\n"
 "Language-Team: Tamil (https://www.transifex.com/otf/teams/1519/ta/)\n"
@@ -92,6 +92,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -185,8 +187,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -588,10 +590,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -632,7 +639,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -653,9 +660,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -663,30 +668,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -694,32 +712,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -728,11 +746,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -740,7 +758,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -761,8 +779,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -873,7 +890,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -994,7 +1011,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor à®¤à®¿à®?à¯?à®?à®®à¯?"
 
@@ -1139,7 +1156,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1147,6 +1164,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+th.po b/contents+th.po
index adbf186e8..b0d4bea62 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -3,17 +3,17 @@
 # Martus Translations <translations@xxxxxxxxxx>, 2019
 # erinm, 2019
 # Ben CM <nebben10814@xxxxxxxxx>, 2019
-# Chumapron Waaddao <chumaporn.t@xxxxxxxxx>, 2019
 # Mumean Muna <muhammadmumin.m@xxxxxxxxxxxxx>, 2019
 # DN DN <deen6@xxxxxxxxxxxxxx>, 2019
+# Chumapron Waaddao <chumaporn.t@xxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
-"Last-Translator: DN DN <deen6@xxxxxxxxxxxxxx>, 2019\n"
+"Last-Translator: Chumapron Waaddao <chumaporn.t@xxxxxxxxx>, 2019\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,6 +99,8 @@ msgstr "à¸?à¸¹à¹?à¸ªà¸?à¸±à¸?à¸ªà¸?à¸¸à¸?"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -200,13 +202,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"à¸?à¸£à¸¸à¸?à¸²à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸? alpha à¸?à¹?à¸²à¸?à¸¸à¸?à¹?à¸à¹?à¸?à¸?à¸±à¸?à¸?à¸²à¸?à¸ªà¸´à¹?à¸?à¸?à¸µà¹?à¸¡à¸±à¸?à¸?à¸³à¸?à¸²à¸?à¹?à¸¡à¹?à¸?à¸¹à¸?à¸?à¹?à¸à¸? "
-"à¹?à¸?à¸·à¹?à¸à¸?à¹?à¸§à¸¢à¹?à¸£à¸²à¸?à¹?à¸?à¸«à¸²à¹?à¸¥à¸° [à¸£à¸²à¸¢à¸?à¸²à¸?à¸?à¸±à¹?à¸?] "
-"(https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" à¹?à¸¥à¸° à¸?à¹?à¸à¸?à¹?à¸¡à¹?à¸?à¸²à¸?à¸±à¸§à¸?à¸¸à¸?à¹?à¸à¸?à¹?à¸?à¸à¸¢à¸¹à¹?à¸ à¸²à¸¢à¹?à¸?à¹?à¸?à¸§à¸²à¸¡à¹?à¸ªà¸µà¹?à¸¢à¸?"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -660,10 +658,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?à¹?à¸?à¸£à¸²à¸§à¹?à¹?à¸?à¸à¸£à¹? Tor"
 
@@ -714,7 +717,7 @@ msgstr ""
 "à¸?à¸£à¸°à¸?à¸²à¸¨à¸¥à¸´à¸?à¸ªà¸´à¸?à¸?à¸´à¹?à¹?à¸¥à¸°à¸?à¸?à¸£à¸°à¹?à¸?à¸µà¸¢à¸?à¸ªà¸³à¸«à¸£à¸±à¸?à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¸²à¸?à¹?à¸?à¸¢à¸?à¸¸à¸?à¸?à¸¥à¸?à¸µà¹?à¸ªà¸²à¸¡à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸¹à¹?à¸?à¹?à¹?à¸? "
 "%(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "à¹?à¸¡à¸?à¸¹"
 
@@ -735,9 +738,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -745,30 +746,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "à¸?à¸¹à¸?à¸?à¸¸à¸¢à¸?à¸²à¸£à¸?à¸³à¹?à¸?à¸´à¸?à¸?à¸²à¸? Tor relay"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "à¸?à¹?à¸?à¸«à¸²à¹?à¸£à¸²à¸?à¸?à¸ªà¸·à¹?à¸à¸ªà¸±à¸?à¸?à¸¡"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "à¸à¸²à¸ªà¸²à¸ªà¸¡à¸±à¸?à¸£ à¸?à¸±à¸? Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "à¸¡à¸µà¸ªà¹?à¸§à¸?à¹?à¸?à¸µà¹?à¸¢à¸§à¸?à¹?à¸à¸?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "à¸¥à¸?à¸?à¸°à¹?à¸?à¸µà¸¢à¸?à¸£à¸±à¸?à¸?à¹?à¸²à¸§à¸ªà¸²à¸£"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -776,32 +790,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "à¸£à¸²à¸¢à¸?à¸²à¸?à¸?à¸±à¹?à¸? à¸«à¸£à¸·à¸ à¸?à¹?à¸à¹?à¸ªà¸?à¸à¹?à¸?à¸°"
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "à¸?à¸à¸?à¹?à¸£à¸²à¹?à¸?à¸µà¹?à¸¢à¸§à¸?à¸±à¸? bad relay"
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "à¸£à¸²à¸¢à¸?à¸²à¸?à¸?à¸±à¸?à¸«à¸²à¸?à¸§à¸²à¸¡à¸?à¸¥à¸à¸?à¸ à¸±à¸¢"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -810,11 +824,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "à¸à¸µà¹?à¸¡à¸¥à¹?à¸?à¸¶à¸?à¹?à¸£à¸²"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -822,7 +836,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "à¸ªà¹?à¸?à¹?à¸¡à¸¥à¹?à¸?à¸¶à¸?à¹?à¸£à¸²"
 
@@ -843,9 +857,8 @@ msgid "Go to Google Play"
 msgstr "à¹?à¸?à¸¢à¸±à¸? Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "à¹?à¸?à¸¢à¸±à¸? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -968,8 +981,8 @@ msgid "Download in another language or platform"
 msgstr "à¸?à¸²à¸§à¸?à¹?à¹?à¸«à¸¥à¸?à¹?à¸?à¸ à¸²à¸©à¸²à¸à¸·à¹?à¸?à¸«à¸£à¸·à¸à¸£à¸¹à¸?à¹?à¸?à¸?à¸à¸·à¹?à¸?à¹?"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¸?à¸²à¸£à¸?à¸´à¸?à¸?à¸±à¹?à¸?à¸?à¸±à¹?à¸?à¸ªà¸¹à¸?"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1091,7 +1104,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "à¹?à¸?à¸£à¹?à¸?à¹?à¸? Tor | à¸?à¸§à¸²à¸¡à¹?à¸?à¹?à¸?à¸ªà¹?à¸§à¸?à¸?à¸±à¸§ à¹?à¸¥à¸° à¸à¸´à¸ªà¸£à¸°à¹?à¸?à¸?à¸²à¸£à¸à¸à¸?à¹?à¸¥à¸?à¹?"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "à¹?à¸?à¸£à¸?à¸?à¸²à¸£ Tor"
 
@@ -1241,7 +1254,7 @@ msgstr "à¸?à¸³à¹?à¸?à¸´à¸?à¸?à¸²à¸£à¸£à¸±à¸?à¸£à¸µà¹?à¸¥à¸¢à¹?à¹?à¸?à¸·à¹?à¸à¸?
 msgid "Use your skills to volunteer."
 msgstr "à¸à¸²à¸ªà¸²à¸ªà¸¡à¸±à¸?à¸£à¹?à¸?à¸¢à¹?à¸?à¹?à¸?à¸§à¸²à¸¡à¸ªà¸²à¸¡à¸²à¸£à¸?à¸?à¸à¸?à¸?à¸¸à¸?"
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "à¸?à¸¹à¹?à¸¡à¸·à¸ Tow Browser"
 
@@ -1249,6 +1262,22 @@ msgstr "à¸?à¸¹à¹?à¸¡à¸·à¸ Tow Browser"
 msgid "Read more."
 msgstr "à¸à¹?à¸²à¸?à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "à¸¥à¸´à¸?à¸?à¹?à¸?à¸²à¸§à¸£"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "à¸¡à¸¸à¸¡à¸¡à¸à¸? PDF"
diff --git a/contents+tr.po b/contents+tr.po
index fc5e56b82..c98c39606 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,16 +1,16 @@
 # Translators:
 # erinm, 2019
 # T. E. Kalayci <tekrei@xxxxxxxxx>, 2019
-# Emma Peel, 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-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10: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"
@@ -99,6 +99,8 @@ msgstr "DestekÃ§iler"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -201,13 +203,9 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"LÃ¼tfen alfa sÃ¼rÃ¼mlerini yalnÄ±z bazÄ± Å?eylerin dÃ¼zgÃ¼n Ã§alÄ±Å?mamasÄ±na "
-"hazÄ±rsanÄ±z, hatalarÄ± bulmaya ve "
-"[bildirmeye](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)"
-" yardÄ±m etmek istiyorsanÄ±z ve kendinizi riske atmayacaksanÄ±z indirin."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -748,10 +746,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>daÄ?Ä±tÄ±m "
 "dizinimizden</a> indirilebilir."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Tor Browser uygulamasÄ±nÄ± indirin"
 
@@ -802,7 +805,7 @@ msgstr ""
 "Ã?Ã§Ã¼ncÃ¼ taraflarÄ±n kullanabileceÄ?i patent, telif hakkÄ± ve ilkeleri Å?urada "
 "bulabilirsiniz %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "MenÃ¼"
 
@@ -825,13 +828,8 @@ msgstr ""
 "Fikirlerinizi bekliyoruz."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
-"BuluÅ?malar, bilinirliÄ?i arttÄ±rma Ã§alÄ±Å?malarÄ±, Ã§eviriler ya da web sitesinde "
-"iyileÅ?tirmeler gibi kuruluÅ? ve toplulukla ilgili konularÄ± hakkÄ±nda "
-"konuÅ?abilirsiniz."
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
@@ -840,30 +838,43 @@ msgstr ""
 "katÄ±labilirsiniz."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Bir tor aktarÄ±cÄ±sÄ± iÅ?letmek Ã¼zerine konuÅ?abilirsiniz."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Tor gÃ¼ney kÃ¼resel topluluÄ?u ile konuÅ?abilirsiniz."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Bizi Sosyal AÄ?lardan Ä°zleyin"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Tor Projesine GÃ¶nÃ¼llÃ¼sÃ¼ KatkÄ±da Bulunun"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "KatkÄ±da Bulunun"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "E-posta listesine katÄ±lÄ±n"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -875,11 +886,11 @@ msgstr ""
 " istediÄ?iniz bir sorunuz varsa, hangi listeye yazmanÄ±z gerektiÄ?ini "
 "sorabilirsiniz. Bu listelere Ã¼ye olup izleyebilirsiniz :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Bir hata bildirin ya da dÃ¼Å?Ã¼ncelerinizi iletin."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -890,11 +901,11 @@ msgstr ""
 "nedenle geri bildirimleriniz bizim iÃ§in (ve tÃ¼m Tor kullanÄ±cÄ±larÄ± iÃ§in) Ã§ok "
 "deÄ?erlidir."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Ã?alÄ±Å?mayan aktarÄ±cÄ±larÄ± bildirin."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -903,11 +914,11 @@ msgstr ""
 "dÃ¼Å?Ã¼ndÃ¼Ä?Ã¼nÃ¼z bir aktarÄ±cÄ± bulursanÄ±z, nasÄ±l bildireceÄ?inizi Ã¶Ä?renmek iÃ§in "
 "wiki sayfamÄ±za ve gÃ¼nlÃ¼k yazÄ±larÄ±na bakabilirsiniz."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Bir gÃ¼venlik sorununu bildirin."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -921,11 +932,11 @@ msgstr ""
 "security-sendkey@xxxxxxxxxxxxxxxxxxxx ya da pool.sks-keyservers.net "
 "adresinden alabilirsiniz. Parmak izi:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Bize e-posta gÃ¶nderin"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -937,7 +948,7 @@ msgstr ""
 "frontdesk@xxxxxxxxxxxxxxxxx adresine e-posta gÃ¶nderin. BaÄ?Ä±Å?larla ilgili "
 "sorularÄ±nÄ±z iÃ§in giving@xxxxxxxxxxxxxx adresine e-posta gÃ¶nderebilirsiniz."
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Bize Posta GÃ¶nderin"
 
@@ -958,9 +969,8 @@ msgid "Go to Google Play"
 msgstr "Google Play UygulamasÄ±na Gidin"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "F-droid %s UygulamasÄ±na Gidin"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1085,8 +1095,8 @@ msgid "Download in another language or platform"
 msgstr "BaÅ?ka bir dil ya da platform iÃ§in indirmelere bakÄ±n"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "GeliÅ?miÅ? Kurulum SeÃ§enekleri"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1228,7 +1238,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor Projesi | Ã?evrimiÃ§i KiÅ?isel Gizlilik ve Ã?zgÃ¼rlÃ¼k"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Projesi"
 
@@ -1388,7 +1398,7 @@ msgstr "Dah ahÄ±zlÄ± ve daÄ?Ä±tÄ±lmÄ±Å? bir aÄ? iÃ§in bir aktarÄ±cÄ± iÅ?letebili
 msgid "Use your skills to volunteer."
 msgstr "Becerilerinizi kullanarak gÃ¶nÃ¼llÃ¼ katkÄ±da bulunabilirsiniz."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser Rehberi"
 
@@ -1396,6 +1406,22 @@ msgstr "Tor Browser Rehberi"
 msgid "Read more."
 msgstr "AyrÄ±ntÄ±lÄ± bilgi alÄ±n."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Bu sayfaya katkÄ±da bulunanlar:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Bu sayfayÄ± dÃ¼zenleyin"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Ã?neride Bulunun"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "KalÄ±cÄ± baÄ?lantÄ±"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "PDF Belgesi"
diff --git a/contents+uk.po b/contents+uk.po
index cc8e02be6..3d604e7be 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -91,6 +91,8 @@ msgstr "Ð¡Ð¿Ð¾Ð½Ñ?Ð¾Ñ?Ð¸"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Ð?Ñ?Ð¸Ð¹Ð½Ñ?Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ð?Ñ?Ð¾ÐµÐºÑ? Tor"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+ur.po b/contents+ur.po
index 84905aebe..13859041b 100644
--- a/contents+ur.po
+++ b/contents+ur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Ali Kamran <kamran@xxxxxxxxxxxxxxxxxxxxxxxxxx>, 2019\n"
 "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Ù¹Ø§Ø± Ù¾Ø±Ø§Ø¬Ú©Ù¹"
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+uz.po b/contents+uz.po
index 38ce6a156..79603dfec 100644
--- a/contents+uz.po
+++ b/contents+uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Uzbek (https://www.transifex.com/otf/teams/1519/uz/)\n"
@@ -90,6 +90,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -183,8 +185,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -586,10 +588,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -630,7 +637,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -651,9 +658,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -661,30 +666,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -692,32 +710,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -726,11 +744,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -738,7 +756,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -759,8 +777,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -871,7 +888,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -992,7 +1009,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr ""
 
@@ -1137,7 +1154,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1145,6 +1162,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+vi.po b/contents+vi.po
index 42fce616d..c98cf151b 100644
--- a/contents+vi.po
+++ b/contents+vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: Henry Tran <henry.trancsr@xxxxxxxxx>, 2019\n"
 "Language-Team: Vietnamese (https://www.transifex.com/otf/teams/1519/vi/)\n"
@@ -91,6 +91,8 @@ msgstr ""
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -184,8 +186,8 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 
 #: https//www.torproject.org/download/languages/
@@ -587,10 +589,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -631,7 +638,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -652,9 +659,7 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr ""
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
 msgstr ""
 
 #: templates/contact.html:12
@@ -662,30 +667,43 @@ msgid "Watch or join publicly logged team meetings."
 msgstr ""
 
 #: templates/contact.html:13
-msgid "Discuss running a Tor relay."
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
 msgstr ""
 
 #: templates/contact.html:14
+msgid "Discuss running a Tor relay."
+msgstr ""
+
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr ""
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr ""
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr ""
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr ""
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr ""
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -693,32 +711,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr ""
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -727,11 +745,11 @@ msgid ""
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr ""
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -739,7 +757,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr ""
 
@@ -760,8 +778,7 @@ msgid "Go to Google Play"
 msgstr ""
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
+msgid "Go to F-Droid"
 msgstr ""
 
 #: templates/download-android.html:36
@@ -872,7 +889,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Dá»± Ã¡n Tor"
 
@@ -1138,7 +1155,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1146,6 +1163,22 @@ msgstr ""
 msgid "Read more."
 msgstr ""
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr ""
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 5428c045e..2b35d9cbd 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -8,15 +8,15 @@
 # MD Rights <psychi2009@xxxxxxxxx>, 2019
 # Dianyu Liu <liudianyu5@xxxxxxxxx>, 2019
 # erinm, 2019
-# Emma Peel, 2019
 # ff98sha, 2019
+# Emma Peel, 2019
 # PCloud <heige.pcloud@xxxxxxxxxxx>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: PCloud <heige.pcloud@xxxxxxxxxxx>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -100,6 +100,8 @@ msgstr "èµ?å?©æ?¹"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -194,11 +196,9 @@ msgstr "å?¨æ??ä»¬å??å¸?æ??ä»¬è½¯ä»¶ç??ç¨³å®?ç??æ?¬å??ï¼?æ??ä»¬ä¼?å??å¸?ä¸?ä¸ª al
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"å¦?æ??ä½ è?½é??åº?ä¸?äº?ä¸?è?½æ£å¸¸å·¥ä½?ç??ä¸?è¥¿ï¼?ä¸?ä¸?ä¼?ä½¿è?ªå·±å¤?äº?å?±é?©ä¹?ä¸ç??è¯?ï¼?è¯·å?ªä¸?è½½ alpha "
-"ç??æ?¬ï¼?å¸®å?©æ??ä»¬æ?¾å?°å¹¶[æ?¥å??é??è¯¯](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)ã??"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -651,10 +651,15 @@ msgstr ""
 "alpha\">Tor Browser Project</a> å®?ç½?å??æ??ä»¬ç??<a "
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>å??å??ç?®å½?</a>ä¸å??å¸?ã??"
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "ä¸?è½½ Tor æµ?è§?å?¨"
 
@@ -696,7 +701,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr "å??æ ?ä¿?æ?¤ã??ç??æ??ä¿?æ?¤ä»¥å??ç¬¬ä¸?æ?¹ä½¿ç?¨è§?å??å?¯ä»¥å?¨ %(link_to_faq)s æ?¾å?°"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "è??å??"
 
@@ -717,40 +722,51 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "è®¨è®º Tor ç?¸å?³ç??ä»£ç ?å??å??è®®ã?? æ¬¢è¿?æ??å?ºç??æ³?ã??"
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
-msgstr "è®¨è®ºç»?ç»?å??ç¤¾å?ºç?¸å?³ä¸»é¢?ï¼?è??ä¼?ï¼?æ?¨å¹¿ï¼?ç¿»è¯?æ??ç½?ç«?æ?¹è¿?ã??"
+msgid "Get in touch with other translators"
+msgstr ""
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "å?¬å¼?å?°è§?ç??æ??å? å?¥è®°å½?ç??å?¢é??ä¼?è®®ã??"
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "è®¨è®ºè¿?è¡?ä¸?ä¸ª Tor ä¸ç»§è??ç?¹ã??"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "ä¸? Tor ç??å?¨ç??å??æ?¹ç¤¾å?ºäº¤è°?ã??"
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "å?¨ç¤¾äº¤åª?ä½?ä¸?æ?¾å?°æ??ä»¬"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Tor å¿?æ?¿è??"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "å?¥é?¨æ??å??"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "å? å?¥é?®ä»¶å??è¡¨"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -760,32 +776,32 @@ msgstr ""
 "æ??ä»¬ç??å?¢é??å?¨å¼?æ?¾æ¸ é??ï¼?å??æ?¬ç?µå?é?®ä»¶å??è¡¨ä¸è¿?è¡?å??ä½?ï¼?æ¬¢è¿?ä½ ç??å? å?¥ã?? å¦?æ??ä½ å¯¹æ??ä»¬ç??ç?¹å®?å?¢é??æ??ç??é?®ï¼?ä¸?å?¨æ??ä»¬ç??æ?¯æ??é?¨æ?·ç½?ç«?ä¸?æ?ªå??ç?ï¼?æ?¨å?¯ä»¥è¯¢é?®ç?¸åº?ç??å??è¡¨ã?? "
 "æ¬¢è¿?æ?¨è®¢é??å¹¶è§?ç??:)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "æ?¥å??ç¼ºé?·æ??æ??äº¤å??é¦?"
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr "Tor ä¾?é? å?¨ç??ç?¨æ?·å??å¿?æ?¿è??ç??æ?¯æ??æ?¥å¸®å?©æ??ä»¬æ?¹è¿?æ??ä»¬ç??è½¯ä»¶å??èµ?æº?ï¼?å? æ¤æ?¨ç??å??é¦?å¯¹æ??ä»¬ï¼?ä»¥å??æ??æ?? Tor ç?¨æ?·ï¼?é?½é??å¸¸æ??ä»·å?¼ã??"
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "å??ç?¥æ??ä»¬å?³äº?æ??å??ç??ä¸ç»§ã??"
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr "å¦?æ??ä½ å??ç?°äº?ä¸?ä¸ªä½ è®¤ä¸ºæ?¯æ?¶æ??ç??ï¼?é??ç½®é??è¯¯ç??æ??è??å?¶ä»?æ??å??ç??ä¸ç»§ï¼?è¯·æ?¥ç??æ??ä»¬ç??ç»´å?ºé¡µé?¢å??å??å®¢æ??ç« æ?¥äº?è§£å¦?ä½?æ?¥å??å®?ã??"
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "æ?¥å??å®?å?¨é?®é¢?ã??"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -797,11 +813,11 @@ msgstr ""
 "å¦?æ??ä½ é??è¦?å? å¯?ä½ ç??é?®ä»¶ï¼?ä½ å?¯ä»¥é??è¿?è??ç³» tor-security-sendkey@xxxxxxxxxxxxxxxxxxxx æ??ä»? pool.sks-"
 "keyservers.net è?·å??å??è¡¨ç?? GPG å?¬é?¥ã?? è¿?é??æ?¯æ??çº¹ï¼?"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "ç»?æ??ä»¬å??é?®ä»¶"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -811,7 +827,7 @@ msgstr ""
 "å¯¹äº?æ??å?³ Tor é??è?¥å?©ç»?ç»?ç??é?®é¢?å??æ??è§?ï¼?å??æ ?é?®é¢?ï¼?ä»?å±?å??å??ä½?ï¼?å??å??å?¨è¯¢ç?ï¼?è¯·å??é??ç?µå?é?®ä»¶è?³ frontdesk@xxxxxxxxxxxxxxxxxã?? "
 "å¯¹äº?æ??å?©ç?¸å?³é?®é¢?ï¼?è¯·è??ç³» giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "ç»?æ??ä»¬å??é?®ä»¶"
 
@@ -832,9 +848,8 @@ msgid "Go to Google Play"
 msgstr "å??å¾? Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "å??å¾? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -946,8 +961,8 @@ msgid "Download in another language or platform"
 msgstr "ä¸?è½½å?¶ä»?è¯è¨?æ??å¹³å?°ç??ç??æ?¬"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "é«?çº§å®?è£?é??é¡¹"
+msgid "Download the latest alpha build"
+msgstr ""
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1068,7 +1083,7 @@ msgstr "æ??ä»¬é??è¯·ä½ å?¨ IRC ä¸å? å?¥æ??ä»¬ï¼?æ?¥ç??ç??ä½ è?½å¦?ä½?å¸®å?©ã??"
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "Tor Project | é??ç§?å??çº¿ä¸?è?ªç?±"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1216,7 +1231,7 @@ msgstr "è¿?è¡?ä¸?ä¸ªä¸ç»§ï¼?æ?¥ä½¿ç½?ç»?æ?´å¿«å??æ?´å?»ä¸å¿?å??ã??"
 msgid "Use your skills to volunteer."
 msgstr "æ??ä¸ºå¿?æ?¿è??ä½¿ç?¨ä½ ç??æ??è?½"
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor æµ?è§?å?¨ç?¨æ?·æ??å??"
 
@@ -1224,6 +1239,22 @@ msgstr "Tor æµ?è§?å?¨ç?¨æ?·æ??å??"
 msgid "Read more."
 msgstr "äº?è§£æ?´å¤?ã??"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "æ¤é¡µé?¢ç??è´¡ç?®è??ï¼?"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "ç¼?è¾?æ¤é¡µé?¢"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "å»ºè®®å??é¦?"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "æ°¸ä¹?é?¾æ?¥"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "æ?¥ç?? PDF ç??æ?¬ã??"
diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index c1aae61d5..b6c58a44e 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -94,6 +94,8 @@ msgstr "è´?å?©"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -187,11 +189,9 @@ msgstr "å?¨æ??å??ç?¼ä½?æ??å??è»?é«?ç??ç©©å®?ç??æ?¬å??ï¼?æ??å??æ??ç?¼ä½?ä¸?å?? al
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
-"å¦?æ??ä½ è?½æ?¥å??æ??äº?å?°æ?¹æ²?æ??æ£å¸¸é??ä½?ï¼?è«?å?ªä¸?è¼? alpha "
-"ç??æ?¬ï¼?æ?³å¹«å?©æ??å??æ?¾å?°ä¸¦[å??å ±é?¯èª¤](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)ï¼?è??ä¸?ä¸?æ??è®?è?ªå·±è??æ?¼å?±é?ªä¹?ä¸ã??"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -595,10 +595,15 @@ msgid ""
 "directory</a>."
 msgstr ""
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr ""
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -639,7 +644,7 @@ msgid ""
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr ""
 
@@ -660,40 +665,51 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "è¨?è«? Tor ç?¸é??ç??ç¨?å¼?è¨è¨?å??å??å®?ã??æ¡è¿?æ??å?ºç??æ³?ã??"
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
-msgstr "è¨?è«?çµ?ç¹?å??ç¤¾ç¾¤ç?¸é??ä¸»é¡?ï¼?è??æ??ã??æ?¨å»£ã??ç¿»è¯æ??ç¶²ç«?æ?¹é?²ã??"
+msgid "Get in touch with other translators"
+msgstr ""
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "è§?ç??æ??å? å?¥å?¬é??è¨?é??ç??å??é??æ??è°ã??"
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "è¨?è«?é??è¡?ä¸?å?? Tor ä¸ç¹¼ã??"
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "è?? Tor ç??å?¨ç??å??æ?¹ç¤¾ç¾¤äº¤è«?ã??"
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr ""
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr ""
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "å?¨ç¤¾äº¤åª?é«?ä¸?æ?¾å?°æ??å??"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Tor å¿?é¡?è??"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "å? å?¥æ??å??"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "å? å?¥é?µä»¶æ¸?å?®"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -701,32 +717,32 @@ msgid ""
 "subscribe and just watch, too :)"
 msgstr ""
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr ""
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 msgstr ""
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr ""
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 msgstr ""
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "å ±å??å®?å?¨å??é¡?ã??"
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -738,11 +754,11 @@ msgstr ""
 "security@xxxxxxxxxxxxxxxxxxxxã??å¦?æ??ä½ é??è¦?å? å¯?ä½ ç??é?µä»¶ï¼?ä½ å?¯ä»¥é??é??è?¯ç¹« tor-security-"
 "sendkey@xxxxxxxxxxxxxxxxxxxx æ??å¾? pool.sks-keyservers.net ç?²å??æ¸?å?®ç??GPG å?¬é??é??é?°ã??é??æ?¯æ??ç´?ï¼?"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "å?³é??é?»å?é?µä»¶çµ¦æ??å??"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -750,7 +766,7 @@ msgid ""
 "giving@xxxxxxxxxxxxxx"
 msgstr ""
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "å?³é??é?»å?é?µä»¶çµ¦æ??å??"
 
@@ -771,9 +787,8 @@ msgid "Go to Google Play"
 msgstr "å??å¾? Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "å??å¾? F-droid %s"
+msgid "Go to F-Droid"
+msgstr ""
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -883,7 +898,7 @@ msgid "Download in another language or platform"
 msgstr ""
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
+msgid "Download the latest alpha build"
 msgstr ""
 
 #: templates/hero-download.html:50
@@ -1004,7 +1019,7 @@ msgstr ""
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr ""
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor è¨?ç?«"
 
@@ -1149,7 +1164,7 @@ msgstr ""
 msgid "Use your skills to volunteer."
 msgstr ""
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr ""
 
@@ -1157,6 +1172,22 @@ msgstr ""
 msgid "Read more."
 msgstr "äº?è§£æ?´å¤?ã??"
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr ""
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr ""
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr ""
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr ""
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "æª¢è¦? PDF"
diff --git a/contents.pot b/contents.pot
index 775e1f58a..9ec43e6bb 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 08:34+CET\n"
+"POT-Creation-Date: 2019-09-17 15:46+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"
@@ -90,6 +90,8 @@ msgstr "Sponsors"
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
 #: https//www.torproject.org/about/people/
@@ -189,13 +191,13 @@ msgstr ""
 msgid ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 msgstr ""
 "Please only download an alpha if you are okay with some things not working "
 "properly, want to help us find and [report "
-"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
-" and are not putting yourself at risk."
+"bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
+"putting yourself at risk."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -725,10 +727,15 @@ msgstr ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\";>distribution "
 "directory</a>."
 
+#: https//www.torproject.org/about/trademark/trademark-faq/
+#: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
+msgid "Tor Trademark Frequently Asked Questions"
+msgstr "Tor Trademark Frequently Asked Questions"
+
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
-#: lego/templates/navbar.html:66 templates/footer.html:9
+#: lego/templates/navbar.html:73 templates/footer.html:9
 #: templates/footer.html:18 templates/hero-home.html:13
-#: templates/navbar.html:66
+#: templates/navbar.html:73
 msgid "Download Tor Browser"
 msgstr "Download Tor Browser"
 
@@ -777,7 +784,7 @@ msgstr ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our %(link_to_faq)s"
 
-#: lego/templates/navbar.html:15 templates/navbar.html:15
+#: lego/templates/navbar.html:20 templates/navbar.html:20
 msgid "Menu"
 msgstr "Menu"
 
@@ -798,42 +805,52 @@ msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
 msgstr "Discuss Tor-related coding and protocols. Ideas are welcome."
 
 #: templates/contact.html:11
-msgid ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
-msgstr ""
-"Discuss organization and community related topics: meetups, outreach, "
-"translation, or website improvements."
+msgid "Get in touch with other translators"
+msgstr "Get in touch with other translators"
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
 msgstr "Watch or join publicly logged team meetings."
 
 #: templates/contact.html:13
+msgid ""
+"Discuss organization and community related topics: meetups and outreach."
+msgstr ""
+"Discuss organization and community related topics: meetups and outreach."
+
+#: templates/contact.html:14
 msgid "Discuss running a Tor relay."
 msgstr "Discuss running a Tor relay."
 
-#: templates/contact.html:14
+#: templates/contact.html:15
 msgid "Talk with Tor's global south community."
 msgstr "Talk with Tor's global south community."
 
-#: templates/contact.html:20
+#: templates/contact.html:16
+msgid "Talk with us about improvements on our websites."
+msgstr "Talk with us about improvements on our websites."
+
+#: templates/contact.html:17
+msgid "Discuss UX related ideas."
+msgstr "Discuss UX related ideas."
+
+#: templates/contact.html:23
 msgid "Find us on Social Media"
 msgstr "Find us on Social Media"
 
-#: templates/contact.html:34
+#: templates/contact.html:37
 msgid "Volunteer with Tor"
 msgstr "Volunteer with Tor"
 
-#: templates/contact.html:38
+#: templates/contact.html:41
 msgid "Get Involved"
 msgstr "Get Involved"
 
-#: templates/contact.html:44
+#: templates/contact.html:47
 msgid "Join an email list"
 msgstr "Join an email list"
 
-#: templates/contact.html:47
+#: templates/contact.html:50
 msgid ""
 "Our teams collaborate in open channels, including email lists, you are "
 "welcome to join. If you have a question for a specific team not answered on "
@@ -845,11 +862,11 @@ msgstr ""
 "our support portal, you can ask the appropriate list. You're welcome to "
 "subscribe and just watch, too :)"
 
-#: templates/contact.html:60
+#: templates/contact.html:63
 msgid "Report a bug or give feedback."
 msgstr "Report a bug or give feedback."
 
-#: templates/contact.html:61
+#: templates/contact.html:64
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
@@ -859,11 +876,11 @@ msgstr ""
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
 
-#: templates/contact.html:67
+#: templates/contact.html:70
 msgid "Tell us about a bad relay."
 msgstr "Tell us about a bad relay."
 
-#: templates/contact.html:68
+#: templates/contact.html:71
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
@@ -871,11 +888,11 @@ msgstr ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
 
-#: templates/contact.html:76
+#: templates/contact.html:79
 msgid "Report a security issue."
 msgstr "Report a security issue."
 
-#: templates/contact.html:77
+#: templates/contact.html:80
 msgid ""
 "If you've found a security issue in one of our projects or in our "
 "infrastructure, please email tor-security@xxxxxxxxxxxxxxxxxxxx. If you want "
@@ -889,11 +906,11 @@ msgstr ""
 "contacting tor-security-sendkey@xxxxxxxxxxxxxxxxxxxx or from pool.sks-"
 "keyservers.net. Here is the fingerprint:"
 
-#: templates/contact.html:97
+#: templates/contact.html:100
 msgid "Email us"
 msgstr "Email us"
 
-#: templates/contact.html:98
+#: templates/contact.html:101
 msgid ""
 "For questions and comments about Tor the non-profit organization: trademark "
 "questions, affiliation and coordination, contract inquiries, etc, please "
@@ -905,7 +922,7 @@ msgstr ""
 "email frontdesk@xxxxxxxxxxxxxxxxx. For donor-related questions, contact "
 "giving@xxxxxxxxxxxxxx"
 
-#: templates/contact.html:104
+#: templates/contact.html:107
 msgid "Send us Mail"
 msgstr "Send us Mail"
 
@@ -926,9 +943,8 @@ msgid "Go to Google Play"
 msgstr "Go to Google Play"
 
 #: templates/download-android.html:26
-#, python-format
-msgid "Go to F-droid %s"
-msgstr "Go to F-droid %s"
+msgid "Go to F-Droid"
+msgstr "Go to F-Droid"
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1051,8 +1067,8 @@ msgid "Download in another language or platform"
 msgstr "Download in another language or platform"
 
 #: templates/hero-download.html:46
-msgid "Advanced Install Options"
-msgstr "Advanced Install Options"
+msgid "Download the latest alpha build"
+msgstr "Download the latest alpha build"
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
@@ -1190,7 +1206,7 @@ msgstr "We invite you to join us on IRC to find how you can get involved."
 msgid "The Tor Project | Privacy & Freedom Online"
 msgstr "The Tor Project | Privacy & Freedom Online"
 
-#: templates/meta.html:16
+#: templates/meta.html:17
 msgid "Tor Project"
 msgstr "Tor Project"
 
@@ -1348,7 +1364,7 @@ msgstr "Run a relay to make the network faster and more decentralized."
 msgid "Use your skills to volunteer."
 msgstr "Use your skills to volunteer."
 
-#: templates/macros/downloads.html:61
+#: templates/macros/downloads.html:68
 msgid "Tor Browser manual"
 msgstr "Tor Browser manual"
 
@@ -1356,6 +1372,22 @@ msgstr "Tor Browser manual"
 msgid "Read more."
 msgstr "Read more."
 
+#: templates/macros/question.html:12
+msgid "Contributors to this page:"
+msgstr "Contributors to this page:"
+
+#: templates/macros/question.html:14
+msgid "Edit this page"
+msgstr "Edit this page"
+
+#: templates/macros/question.html:15
+msgid "Suggest Feedback"
+msgstr "Suggest Feedback"
+
+#: templates/macros/question.html:16
+msgid "Permalink"
+msgstr "Permalink"
+
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"
 msgstr "View PDF"

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

Prev by Author: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
Next by Author: [tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
Previous by thread: [tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
Next by thread: [tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
Index(es):
- Author
- Thread