[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



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