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

translation at torproject.org translation at torproject.org
Thu Sep 5 15:51:10 UTC 2019


commit 9164c8b3c7d16488e733e746960a1bfceb459a16
Author: Translation commit bot <translation at torproject.org>
Date:   Thu Sep 5 15:51:07 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+ar.po    | 394 ++++++++++++++++++++--------------------------
 contents+bg.po    | 321 ++++++++++++++++++-------------------
 contents+bn.po    | 381 ++++++++++++++++++++------------------------
 contents+ca.po    | 422 ++++++++++++++++++++-----------------------------
 contents+cs.po    | 304 +++++++++++++++++++-----------------
 contents+da.po    | 297 +++++++++++++++++++----------------
 contents+de.po    | 447 ++++++++++++++++++++--------------------------------
 contents+el.po    | 428 ++++++++++++++++++++------------------------------
 contents+en-GB.po | 308 +++++++++++++++++++-----------------
 contents+en.po    | 460 +++++++++++++++++++++++++++++-------------------------
 contents+es-AR.po | 424 ++++++++++++++++++++-----------------------------
 contents+es.po    | 441 +++++++++++++++++++++------------------------------
 contents+fa.po    | 427 ++++++++++++++++++++------------------------------
 contents+fr.po    | 445 ++++++++++++++++++++--------------------------------
 contents+ga.po    | 424 ++++++++++++++++++++-----------------------------
 contents+he.po    | 393 ++++++++++++++++++++--------------------------
 contents+hr.po    | 372 ++++++++++++++++++++-----------------------
 contents+hu.po    | 327 +++++++++++++++++++-------------------
 contents+id.po    | 438 ++++++++++++++++++++-------------------------------
 contents+is.po    | 443 ++++++++++++++++++++--------------------------------
 contents+it.po    | 428 ++++++++++++++++++++------------------------------
 contents+ja.po    | 304 +++++++++++++++++++-----------------
 contents+ka.po    | 434 ++++++++++++++++++++-------------------------------
 contents+ko.po    | 303 ++++++++++++++++++-----------------
 contents+lt.po    | 298 +++++++++++++++++++----------------
 contents+lv.po    | 313 +++++++++++++++++++------------------
 contents+mk.po    | 408 ++++++++++++++++++++----------------------------
 contents+ms.po    | 415 ++++++++++++++++++++----------------------------
 contents+nb-NO.po | 313 +++++++++++++++++++------------------
 contents+nl.po    | 324 +++++++++++++++++++-------------------
 contents+pl.po    | 430 ++++++++++++++++++++------------------------------
 contents+pt-BR.po | 435 ++++++++++++++++++++-------------------------------
 contents+pt-PT.po | 438 ++++++++++++++++++++-------------------------------
 contents+ro.po    | 443 ++++++++++++++++++++--------------------------------
 contents+ru.po    | 406 ++++++++++++++++++++---------------------------
 contents+sr.po    | 303 ++++++++++++++++++-----------------
 contents+sv-SE.po | 314 +++++++++++++++++++------------------
 contents+th.po    | 424 ++++++++++++++++++++-----------------------------
 contents+tr.po    | 454 ++++++++++++++++++++++-------------------------------
 contents+uk.po    | 327 +++++++++++++++++++-------------------
 contents+vi.po    | 397 ++++++++++++++++++++--------------------------
 contents+zh-CN.po | 371 +++++++++++++++++++++----------------------
 contents+zh-TW.po | 305 +++++++++++++++++++-----------------
 contents.pot      | 460 +++++++++++++++++++++++++++++-------------------------
 44 files changed, 7547 insertions(+), 9396 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 3ea27d447..f470751d0 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1,19 +1,19 @@
 # Translators:
 # Mohamed El-Feky <elfeky.m at gmail.com>, 2018
 # Ramy Rostom <ramyrostom at protonmail.com>, 2019
-# erinm, 2019
 # Khaled Hosny, 2019
-# Emma Peel, 2019
 # Ahmed A. <6622227a at gmail.com>, 2019
 # Ahmed IB <mee.tbhole at gmail.com>, 2019
+# erinm, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Ahmed IB <mee.tbhole at gmail.com>, 2019\n"
+"Last-Translator: Emma Peel, 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"
@@ -191,12 +191,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"مبدئيا لا يحفظ متصفّح تور تأريخ التصفح. صلاحية الكعكات جلسة واحدة فقط (حتى "
-"إغلاق متصفّح تور أو طلب<a href=\"/managing-identities/#new-identity\">هويّة "
-"جديدة</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -413,15 +410,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"في أغلب الحالات، اختيار ”اتصل“ سيتيح لك الاتّصال بشبكة تور دون أي إعدادات "
-"إضافية. بعد النّقر عليها سيظهر لك شريط الحالة، مبيّنا تقدّم الاتّصال بشبكة "
-"تور. إذا كان اتّصالك بالإنترنت سريعا نوعا ما، ورغم ذلك يبدو لك أن هذا الشريط"
-" عالق في نقطة معينة، توجّه إلى صفحة <a href=\"/troubleshooting\">استكشاف "
-"الأخطاء وإصلاحها</a> للمساعدة على حلّ المشكلة."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -452,14 +443,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"تسألك أول صفحة ما إذا كان اتّصالك بشبكة تور محجوبا أو خاضعا للرقابة. إذا كنت"
-" تظن أن هذا لا ينطبق عليك، فاختر ”لا“. إذا كنت تعرف أنّ اتّصالك خاضع "
-"للرقابة، أو إن حاولت الاتّصال بشبكة تور وفشلت، ولم تنجح أي حلول أخرى، اختر "
-"”نعم“. ستوجّه عندئذ إلى صفحة <a href=\"/circumvention\">تجاوز حول الحجب</a> "
-"لضبط ناقل موصول. "
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -502,18 +488,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"تعتمد غالبية </a>النواقل الموصولة<a href=\"/transports\">، مثل obfs3 و "
-"obfs4، على استخدام تحويلات ”الجسور“. الجسور –مثلها مثل التحويلات العاديّة "
-"لشبكة تور– يشغّلها متطوّعون. لكن –على خلاف التحويلات العادية– الجسور غير "
-"مدرجة علنيًّا، و بالتالي لا يستطيع الخصوم التعرّف عليها بسهولة. استخدام "
-"الجسور بالإضافة إلى النواقل الموصولة يساعد على تمويه استخدامك لشبكة تور."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -673,8 +653,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -684,10 +664,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"يجعل obfs4 حركة نشاط تور تبدو عشوائية مثل obfs3، كما تمنع جهات الحجب من "
+"العثور على الجسور بمسح الإنترنت بحثا عنها. جسور obfs4 أقل عرضة للحجب من جسور"
+" obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -701,22 +684,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"يجعل obfs4 حركة نشاط تور تبدو عشوائية مثل obfs3، كما تمنع جهات الحجب من "
-"العثور على الجسور بمسح الإنترنت بحثا عنها. جسور obfs4 أقل عرضة للحجب من جسور"
-" obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -841,14 +808,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"قد يحجب مزوّدك للإنترنت أو الدولة الولوج المباشر إلى شبكة تور. يشمل متصفّح "
-"تور بعض الأدوات لتجاوز هذا الحجب. تسمّى هذه الأدوات باسم ”النواقل الموصولة“."
-" توجّه إلى صفحة <a href=\"/transports\">النواقل الموصولة</a> للمزيد من "
-"المعلومات حول أنواع النقل المتوفّرة حالياً. "
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -905,32 +867,24 @@ msgstr "##### أي ناقل عليّ استخدامه؟"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"يعمل كل من النواقل الموجودة في قائمة مشغل تور بطريقة مختلفة (للمزيد من "
-"المعلومات توجّه إلى صفحة <a href=\"/transports\"> النواقل الموصولة</a> )، "
-"وتعتمد فعّالية كل منها على ظروفك الخاصة."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"إذا جرّبت كل هذه الخيارات ولم تتمكّن من الوصول إلى الإنترنت، فسيكون عليك "
-"إدخال عناوين الجسور يدويا. اقرأ قسم<a href=\"/en-US/bridges/\">الجسور</a> "
-"لتتعلّم ماهيّة الجسور وكيفية الحصول عليها."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1021,9 +975,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1071,11 +1025,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* راجع صفحة <a href=\"/secure-connections\">الاتصالات الآمنة</a> لمعلومات "
-"مهمة حول كيفية تأمين اتصالك أثناء الولوج."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1141,20 +1093,14 @@ msgstr "##### دائرة تور جديدة لهذا الموقع"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"يفيد هذا الخيار في حال تعذّر على </a>تحويلة الخروج<a href=\"/about/#how-tor-"
-"works\"> التي تستخدمها الاتصال بالموقع الذي تريده، أو لم يحمل بشكل صحيح. "
-"اختيار هذا سيتسبب في إعادة تحميل الصفحة أو اللسان الحالي عبر الدائرة "
-"الجديدة. الألسنة والنوافذ الأخرى من نفس الموقع ستستخدم الدائرة الجديدة عند "
-"إعادة تحميلهم. لا يمسح هذا الخيار أي بيانات خاصة أو يفضل الرابط بين نشاطاتك،"
-" أو يؤثر على الاتصالات الحالية للمواقع الأخرى."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1203,11 +1149,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* كل حركة التصفح بين مستخدمي تور وخدمات البصلة معماة من الطرف للطرف، لذا لا "
-"تحتاج لأن تشغل بالك <a href=\"secure-connections\">بالاتصال عبر HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1272,12 +1216,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"يمكن أيضا التأكد من أنك تستطيع الاتصال بخدمات البصلة الأخرى، بالاتصال <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\">بخدمة البصلة لمحرك البحث "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1367,19 +1307,11 @@ msgstr "##### البيانات التي يمكن أن تظهر"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1390,19 +1322,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1413,10 +1337,6 @@ msgstr "الموقع المزار"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1465,10 +1385,6 @@ msgstr "ما إذا كنت تستخدم تور"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1537,63 +1453,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "الأكثر أمنا"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"في هذا المستوى وسائط HTML5 المرئية والمسموعة ستحتاج للنقر عليها لتشغيلها، "
-"وكل تحسينات الأداء في جافاسكربت ستعطّل، وبعض المعادلات الرياضية قد لا تعرض "
-"كما ينبغي، وبعض خصائص عرض النصوص والخطوط ستعطّل، وكذلك بعض أنواع الصور، "
-"وستعطّل جافاسكربت مبدئيًا على كل المواقع، وأغلب أنساق الصوت والڤديو ستعطل، "
-"وبعض الخطوط أو الأيقونات قد لا تعمل."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "آمِن"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"في هذا المستوى وسائط HTML5 المرئية والمسموعة ستحتاج للنقر عليها لتشغيلها، "
-"وكل تحسينات الأداء في جافاسكربت ستعطّل، وبعض المعادلات الرياضية قد لا تعرض "
-"كما ينبغي، وبعض خصائص عرض النصوص والخطوط ستعطّل، وكذلك بعض أنواع الصور، "
-"وستعطّل جافاسكربت مبدئيًا على كل المواقع التي لا تستخدم <a href=\"secure-"
-"connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "عادي"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"في هذا المستوى كل ميزات المتصفح مدعومة. يوفر هذا الخيار أفضل قابلية "
-"للاستخدام."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1685,35 +1588,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "في هذه الدرجة/المرحلة كل خصائص متصفح Tor Browser و موقع الوِبْ مفعلة."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "هذه الدرجة تعطل بعض خصائص موقع الوِبْ التي تكون خطرة عادة."
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "هذا قد يجعل بعض المواقع تفقد فاعليتها."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"هذه الدرجة تسمح فقط بخصائص موقع الوِبْ المطلوبة للمواقع الثابتة والخدمات "
-"الأساسية."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1723,7 +1621,7 @@ msgstr "هذه التغييرات تؤثر على الصور، وسائط الم
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1820,11 +1718,8 @@ msgstr "عندما تنبه لتحديث متصفح تور، أنه تصفحك 
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"أزل متصفح تور من نظام بحذف المجلد الذي يحتوي عليه (راجع قسم<a "
-"href='uninstalling'>إزالة التنصيب</a> لمزيد من المعلومات)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1912,17 +1807,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"على المستخدمين ممن بحاجة إلى درجة عاليا من الأمان ضبط <a href=\"/security-"
-"slider\">مؤشر الأمان</a> في متصفح تور إلى ”شبه عالٍ“ (يعطل جافاسكربت للمواقع"
-" التي لا تستخدم HTTPS) أو ”مرتفع“ (يعطلها لكل المواقع). لكن يجب الانتباه إلى"
-" أن تعطيل جافاسكربت سيمنع عرض الكثير من المواقع بشكل صحيح، لذا فإعداد متصفح "
-"تور المبدئي يسمح لكل المواقع بتشغيل جافاسكربت."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2037,12 +1927,9 @@ msgstr "##### هل يخضع اتصالك للرقابة؟"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"إذا كنت لا تزال غير قادر على الاتصال فربما مزود خدمة الإنترنت يحجب شبكة تور."
-" اقرأ قسم <a href=\"/circumvention\">تجاوز الحجب</a> للاطلاع على بعض الحلول "
-"الممكنة."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2053,13 +1940,9 @@ msgstr "##### مشاكل معروفة"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"يخضع متصفح تور للتطوير المستمر وبعض المشاكل معروفة لكن لمّا تحل بعد. رجاء "
-"طالع صفحة <a href=\"/known-issues\">المشاكل المعروفة</a> لترى إن كنت تعاني "
-"من أحدها."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2152,12 +2035,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* بروتوكول مشاركة الملفات عبر الانترنت BitTorrent على وجه التحديد <mark><a "
-"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">غير "
-"مجهول الهوية عبر Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2171,46 +2051,118 @@ msgstr "كيفية إزالة متصفح تور من نظامك"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "إزالة متصفح تور من نظامك أمر بسيط:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"لا يؤثر متصفح تور على أي من برمجيات النظام أو إعداداته. إزالة متصفح تور لن "
-"تؤثر على برمجيات النظام أو إعداداته."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "إزالة متصفح تور من نظامك أمر بسيط:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "احذف مجلد أو تطبيق متصفح تور"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* أفرغ سلة المهملات"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
-"1. اعثر على مجلد متصفح تور، ومكانه المبدئي في وندوز سطح المكتب، وفي ماك مجلد"
-" التطبيقات، ولا مكان مبدئي له في لينكس بكن اسم المجلد سيكون ”tor-browser_ar“"
-" للنسخة العربية أو ”tor-browser_en-US“ للنسخة الإنجليزية."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. احذف مجلد متصفح تور"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. أفرغ سلة المهملات"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "لاحظ أن أداة إزالة التنصيب في النظام لم تستخدم."
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+bg.po b/contents+bg.po
index 4b83b964a..60888535c 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-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
@@ -183,8 +183,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -386,9 +386,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -421,8 +420,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -465,12 +464,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -621,8 +619,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -632,10 +630,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 кара Tor трафикът да изглежда произволен като при obfs3 и също така "
+"спира цензуриращите от намирането на мостове, когато сканират интернетът. "
+"obfs4 мостовете са по-малко вероятно да бъдат блокирани от obfs3 мостовете."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -649,22 +650,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 кара Tor трафикът да изглежда произволен като при obfs3 и също така "
-"спира цензуриращите от намирането на мостове, когато сканират интернетът. "
-"obfs4 мостовете са по-малко вероятно да бъдат блокирани от obfs3 мостовете."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -776,9 +761,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -829,25 +813,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -944,9 +926,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -996,11 +978,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"Разгледайте страницата <a href=\"/bg/secure-connections\">Сигурни връзки</a>"
-" за важна информация относно как да подсигурите връзката си при вписване."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1061,13 +1041,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1116,12 +1096,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"Целият трафик между Tor потребителя и onion услугите са криптирани от край "
-"до край, така че не е нужно да се притеснявате дали  <a href=\"/bg/secure-"
-"connections\">връзката минава през HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1183,8 +1160,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1269,19 +1245,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1292,19 +1260,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1315,10 +1275,6 @@ msgstr "Сайтът, който посещавате."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1368,10 +1324,6 @@ msgstr "Дали се използва Tor браузърът."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1442,66 +1394,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Най-сигурно"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"На това ниво, HTML5 видео и аудио стават активни само при кликане върху тях "
-"чрез NoScript; всички JavaScript оптимизации са деактивирани; някои "
-"математически уравнения може да не се показват правилно; някои функции по "
-"показване на шрифтове са деактивирани; някои видове изображения са "
-"деактивирани; JavaScript е деактивиран по подразбиране на всички сайтове; "
-"повечето видео и аудио формати са деактивирани; и някои шрифтове и икони "
-"може да не се показват правилно."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "По-сигурно"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"На това ниво, HTML5 видео и аудио стават активни само при кликане върху тях "
-"чрез NoScript; всички JavaScript оптимизации  са деактивирани; някои "
-"математически уравнения може да не се показват правилно; някои функции по "
-"показване на шрифтове са деактивирани; някои видове изображения са "
-"деактивирани; JavaScript е деактивиран по подразбиране на всички не-<a "
-"href=\"/bg/secure-connections\">HTTPS</a> сайтове."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Стандартно"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"На това ниво, всички функции на браузъра са активирани. Това е опцията, "
-"която дава най-голяма функционалност."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1592,32 +1528,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1628,7 +1561,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1732,8 +1665,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1822,11 +1754,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1938,8 +1870,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1951,9 +1883,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2037,8 +1968,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2053,46 +1984,118 @@ msgstr "Как да премахнете Tor браузъра от компют
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor браузърът не променя съществуващ софтуер или настройки на компютъра Ви. "
-"Премахването на Tor браузърът няма да засегне системния софтуер или "
-"настройки."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Забележете, че стандартната функция \"Премахване\" на операционата система "
-"не се използва."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+bn.po b/contents+bn.po
index 5ae181c78..d931ae6f3 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -1,16 +1,16 @@
 # Translators:
 # code smite <codesmite at gmail.com>, 2018
 # Al Shahrior Hasan Sagor <shahrior3814 at gmail.com>, 2018
-# erinm, 2019
 # Emma Peel, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -193,13 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"ডিফল্টরূপে, টর ব্রাউজার কোনও ব্রাউজিং ইতিহাস রাখে না কুকিজ একক সেশনের জন্য "
-"শুধুমাত্র বৈধ (টর ব্রাউজার থেকে প্রস্থান করা হয় বা একটি <a href"
-"=\"/managing-identities/#new-identity\">নতুন পরিচয়</a> অনুরোধ করা হয়) "
-"পর্যন্ত বৈধ।"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -415,16 +411,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"বেশিরভাগ ক্ষেত্রে, \"সংযোগ\" নির্বাচন করা হলে আপনি আর টা নেটওয়ার্ক থেকে "
-"সংযোগ স্থাপনের অনুমতি দেবে না। একবার ক্লিক করলে, টর এর সংযোগ অগ্রগতি দেখানো "
-"হবে, একটি স্ট্যাটাস বার প্রদর্শিত হবে। যদি আপনি একটি অপেক্ষাকৃত দ্রুত সংযোগ "
-"আছে, কিন্তু এই বার একটি নির্দিষ্ট সময়ে আটকে মনে হয়, <a "
-"href=\"troubleshooting\">সমস্যার সমাধান</a> সাহায্যের জন্য সমস্যা সমাধান "
-"পৃষ্ঠা দেখুন।"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -456,15 +445,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"টর নেটওয়ার্ক অ্যাক্সেস আপনার সংযোগ ব্লক বা সেন্সর করা হয় কিনা প্রথম পর্দা "
-"জিজ্ঞাসা। যদি আপনি বিশ্বাস করেন না এটি এই ক্ষেত্রে, \"না\" নির্বাচন করুন যদি"
-" আপনি জানেন যে আপনার সংযোগ সেন্সর করা হয়েছে, বা আপনি চেষ্টা করেছেন এবং টর "
-"নেটওয়ার্কে সংযোগ করতে ব্যর্থ হয়েছেন এবং অন্য কোনো সমাধান কাজ করেনি, "
-"\"হ্যাঁ\" নির্বাচন করুন। একটি প্ল্যাগেবল ট্রান্সপোর্ট কনফিগার করার জন্য আপনি"
-" তারপর <a href=\"/circumvention\">সার্কোমাম্পশন</a> স্ক্রীনে নিয়ে যাবেন।"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -509,19 +492,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"* সর্বাধিক <a href=\"transports\">প্ল্যাগেবল ট্রান্সপোর্ট</a>, যেমন obfs3 "
-"এবং obfs4 হিসাবে, \"ব্রিজ\" relays ব্যবহারের উপর নির্ভর করে। সাধারণ টর রিলেস"
-" মত, সেতু স্বেচ্ছাসেবকদের দ্বারা চালানো হয়; সাধারণ রিলেস ব্যতীত, তবে, তারা "
-"সর্বজনীন তালিকাভুক্ত না হয়, তাই একটি প্রতিপক্ষ তাদের সহজেই সনাক্ত করতে পারে"
-" না। প্ল্যাগেবল ট্রান্সফর্মের সাথে মিলিত ব্রিজ ব্যবহার করে আপনি টর ব্যবহার "
-"করছেন তা ছদ্মবেশে সাহায্য করে।"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -677,8 +653,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -688,10 +664,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 টর ট্র্যাফিকটি অ্যামফস 3 এর মতো র্যান্ডম দেখায়, এবং ইন্টারনেট "
+"স্ক্যানিং দ্বারা ব্রিজ খুঁজে পেতে সেন্সরগুলিকেও প্রতিরোধ করে। obfs4 ব্রিজ "
+"obfs3 ব্রিজের চেয়ে ব্লক করা সম্ভবত কম।"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -705,22 +684,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 টর ট্র্যাফিকটি অ্যামফস 3 এর মতো র্যান্ডম দেখায়, এবং ইন্টারনেট "
-"স্ক্যানিং দ্বারা ব্রিজ খুঁজে পেতে সেন্সরগুলিকেও প্রতিরোধ করে। obfs4 ব্রিজ "
-"obfs3 ব্রিজের চেয়ে ব্লক করা সম্ভবত কম।"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -838,15 +801,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"টর নেটওয়ার্কে সরাসরি অ্যাক্সেসটি কখনও কখনও আপনার ইন্টারনেট সার্ভিস "
-"প্রোভাইডার বা সরকার কর্তৃক অবরুদ্ধ থাকে। টর ব্রাউজার এই ব্লক কাছাকাছি পেতে "
-"জন্য কিছু circumvention সরঞ্জাম অন্তর্ভুক্ত। এই সরঞ্জামগুলি <a href=\"/en-"
-"US/transports\">\"প্লাগযোগ্য ট্রান্সপোর্টগুলি\"</a> বলা হয়। বর্তমানে উপলব্ধ"
-" যে ধরনের ধরনের উপর আরো তথ্যের জন্য প্ল্যাগেবল ট্রান্সফর্ম পৃষ্ঠা দেখুন."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -896,34 +853,24 @@ msgstr "##### কোন পরিবহন আমি ব্যবহার ক
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"টর লঞ্চারের মেনুতে তালিকাভুক্ত প্রতিটি ট্রান্সলে একটি ভিন্ন উপায়ে কাজ করে "
-"(আরো বিশদ বিবরণের জন্য, <a href=\"/en-US/transports\">প্ল্যাগেবল "
-"ট্রান্সফর্ম</a> পৃষ্ঠাটি দেখুন), এবং তাদের কার্যকারিতা আপনার ব্যক্তিগত "
-"পরিস্থিতির উপর নির্ভর করে।"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"আপনি যদি এই সমস্ত বিকল্পগুলি ব্যবহার করেন, এবং তাদের কেউই আপনাকে অনলাইনে না "
-"পান, তবে আপনাকে ম্যানুয়ালি ব্রিজের ঠিকানাগুলি প্রবেশ করতে হবে। ব্রিজগুলি "
-"কীভাবে শিখছে এবং কিভাবে সেগুলি পেতে হয় তা শিখতে <a href=\"/en-"
-"US/bridges/\">ব্রিজেস</a> বিভাগটি পড়ুন।"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1017,9 +964,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1069,11 +1016,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* লগ ইন ইন করার সময় কীভাবে আপনার সংযোগ সুরক্ষিত রাখতে গুরুত্বপূর্ণ তথ্যের "
-"<a href=\"/bn//secure-connections\">নিরাপদ সংযোগগুলি</a> পৃষ্ঠাটি দেখুন।"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1140,13 +1085,13 @@ msgstr "##### নিউ টর সার্কিট এই সাইটের 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1197,12 +1142,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* টর ব্যবহারকারীদের এবং onion পরিষেবাগুলির মধ্যে সমস্ত ট্র্যাফিক "
-"শেষ-থেকে-শেষ এনক্রিপ্ট হয়েছে, তাই আপনাকে <a href=\"/bn//secure-"
-"connections\">HTTPS</a> এর সাথে সংযোগের বিষয়ে চিন্তা করতে হবে না।"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1267,12 +1209,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"আপনি নিশ্চিত করতে পারেন যে আপনি <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion</a> পরিষেবাতে "
-"সংযুক্ত করে অন্যান্য পেঁয়াজ পরিষেবাগুলি অ্যাক্সেস করতে সক্ষম হচ্ছেন"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1365,19 +1303,11 @@ msgstr "##### সম্ভাব্য দৃশ্যমান ডেটা"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1388,19 +1318,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1411,10 +1333,6 @@ msgstr "সাইট পরিদর্শন করা হচ্ছে।"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1463,10 +1381,6 @@ msgstr "টর্চ ব্যবহার করা হচ্ছে কিন
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1537,65 +1451,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "নিরাপদ"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"এই স্তরে, HTML5 ভিডিও এবং অডিও মিডিয়া নোটসপের মাধ্যমে ক্লিক করার জন্য ক্লিক"
-" করে; সমস্ত জাভাস্ক্রিপ্ট অপ্টিমাইজেশন নিষ্ক্রিয় করা হয় কিছু গাণিতিক "
-"সমীকরণ সঠিকভাবে প্রদর্শন করতে পারে না; কিছু ফন্ট রেন্ডারিং বৈশিষ্ট্য "
-"নিষ্ক্রিয় করা হয়; কিছু ধরনের ইমেজ অক্ষম করা হয়; জাভাস্ক্রিপ্ট সমস্ত সাইট "
-"ডিফল্ট দ্বারা অক্ষম করা হয়; অধিকাংশ ভিডিও এবং অডিও ফরম্যাট অক্ষম; এবং কিছু "
-"ফন্ট এবং আইকন সঠিকভাবে প্রদর্শন করতে পারে না।"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "নিরাপদ"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"এই স্তরে, HTML5 ভিডিও এবং অডিও মিডিয়া নোটসপের মাধ্যমে ক্লিক করার জন্য ক্লিক"
-" করে; সমস্ত জাভাস্ক্রিপ্ট অপ্টিমাইজেশন নিষ্ক্রিয় করা হয় কিছু গাণিতিক "
-"সমীকরণ সঠিকভাবে প্রদর্শন করতে পারে না; কিছু ফন্ট রেন্ডারিং বৈশিষ্ট্য "
-"নিষ্ক্রিয় করা হয়; কিছু ধরনের ইমেজ অক্ষম করা হয়; এবং সমস্ত অ-<a href=\"/bn"
-"//secure-connections\">HTTPS</a> সাইটগুলিতে ডিফল্টভাবে জাভাস্ক্রিপ্ট "
-"নিষ্ক্রিয় করা আছে।"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "মান"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"এই স্তরে, সমস্ত ব্রাউজার বৈশিষ্ট্য সক্ষম করা আছে। এটি সবচেয়ে ব্যবহারযোগ্য "
-"বিকল্প।"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1686,32 +1585,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1722,7 +1618,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1826,8 +1722,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1917,11 +1812,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -2043,12 +1938,9 @@ msgstr "##### আপনার সংযোগ সেন্সর হয়?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"আপনি যদি এখনও সংযোগ করতে না পারেন, তাহলে আপনার ইন্টারনেট পরিষেবা সরবরাহকারী "
-"টর নেটওয়ার্কে সংযোগ বিচ্ছিন্ন হতে পারে। সম্ভব সমাধান জন্য সীমাবদ্ধতা "
-"অধ্যায় পড়ুন।"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2059,14 +1951,9 @@ msgstr "##### জ্ঞাত সমস্যা"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"টর ব্রাউজার ধ্রুবক উন্নয়ন অধীনে, এবং কিছু বিষয় সম্পর্কে জানা যায় কিন্তু "
-"এখনো সংশোধন করা হয় নি। আপনি সম্মুখীন সমস্যা ইতিমধ্যে সেখানে তালিকাভুক্ত করা"
-" হয় কিনা তা জানার জন্য <a href=\"/known-issues\">জ্ঞাত সমস্যা</a> পৃষ্ঠা "
-"চেক করুন।"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2163,11 +2050,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent  পরিস্কারভাবে <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">টর'র মধ্যে অজ্ঞাত নয়</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2181,50 +2066,118 @@ msgstr "আপনার সিস্টেম থেকে টর ব্রা
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "আপনার সিস্টেম থেকে টর ব্রাউজার অপসারণ সহজ:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"টর ব্রাউজার কোনও বিদ্যমান সফটওয়্যার বা আপনার কম্পিউটারের সেটিংসকে প্রভাবিত "
-"করে না। আনইনস্টল করা টর ব্রাউজার আপনার সিস্টেমের সফ্টওয়্যার বা সেটিংস "
-"প্রভাবিত করবে না।"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "আপনার সিস্টেম থেকে টর ব্রাউজার অপসারণ সহজ:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* টর ব্রাউজার ফোল্ডার বা অ্যাপ্লিকেশন মুছে দিন"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* আবর্জনা খালি করুন ।"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
 msgstr ""
-"1. আপনার টর ব্রাউজার ফোল্ডার সনাক্ত। উইন্ডোজের ডিফল্ট অবস্থানটি ডেস্কটপ; "
-"ম্যাক ওএস এক্স এ এটি অ্যাপ্লিকেশন ফোল্ডার। লিনাক্সে, কোন ডিফল্ট অবস্থান নেই,"
-" তবে যদি আপনি ইংরেজ টর ব্রাউজার চালাচ্ছেন তবে ফোল্ডারটির নাম \"tor-"
-"browser_en-US\" থাকবে।"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. টর ব্রাউজার ফোল্ডারটি মুছুন."
+msgid "On Linux:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. আপনার ট্র্যাশ খালি করুন"
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"উল্লেখ্য আপনার অপারেটিং সিস্টেমের মান \"আনইনস্টল\" ইউটিলিটি ব্যবহার করা হয় "
-"না।"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ca.po b/contents+ca.po
index 1537100d2..21ceb9709 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -2,17 +2,17 @@
 # Marc Ripoll <markripesp at gmail.com>, 2018
 # Sandra Monferrer <smonferrer at gmail.com>, 2019
 # jmontane, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # Ecron <ecron_89 at hotmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Ecron <ecron_89 at hotmail.com>, 2019\n"
+"Last-Translator: erinm, 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"
@@ -193,13 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Per defecte, el Navegador Tor no desa l'historial de navegació. Les galetes "
-"només són vàlides per la sessió actual (fins que el Navegador Tor es tanqui "
-"o es sol·liciti una <a href=\"/managing-identities/#new-identity\">Identitat"
-" Nova</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -424,16 +420,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"En molts casos, escollint \"Connectat\" permetrà la connexió a la xarxa Tor "
-"sense més configuració. Un cop fet clic, la barra d'estat apareixerà, "
-"mostrat la progressió de la connexió Tor. La progressió dependrà de la "
-"velocitat de connexió, si experimentà algun problema, consulti <a "
-"href=\"troubleshooting\">Resolució de problemes</a> la pàgina per tronar una"
-" solució."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -465,15 +454,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"La primera pantalla pregunta si l'accés a la xarxa Tor està bloquejada o "
-"censurada. Si creu que no és el cas, seleccioni \"No\". Si creu que la seva "
-"connexió està censurada, o ha fet un intent fallit de connexió a la xarxa "
-"Tor i cap solució ha funcionat, seleccioni \"Si\". Posteriorment serà "
-"derivat a <a href=\"elusió\">Circumvention</a> a la pantalla de paràmetres "
-"dels connectors de transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -517,19 +500,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"La majoria <a href=\"transports\">Transports connectors</a>, com obfs3 i "
-"obfs4, utilitzen els relés de \"pont\". Com el relés estàndard de Tor, els "
-"ponts són usuaris voluntaris; a diferència els relés tradicionals, "
-"independentment, no estan llistat, d'aquesta manera no poden ser fàcilment "
-"identificats. La utilització de ponts en combinació amb els transports "
-"connectors ajuden a disfressar la utilització de Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -700,8 +676,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -711,13 +687,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 fa que el trànsit de Tor sigui aleatori, de manera que no s'assembla a"
-" Tor o cap altre protocol. Encara que s'inclou per defecte, es recomana "
-"utilitzar obfs4, ja que té diverses millores de seguretat sobre obfs3."
+"obfs4 fa que el tràfic Tor sigui aleatori com obfs3, però també pot prevenir"
+" la censura del escaneig de Internet. El pont obfs4 permet menys bloquejos "
+"que el obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -731,22 +707,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 fa que el tràfic Tor sigui aleatori com obfs3, però també pot prevenir"
-" la censura del escaneig de Internet. El pont obfs4 permet menys bloquejos "
-"que el obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -877,15 +837,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"L'accés a la xarxa Tor pot tot sovint ser bloquejat pel seu proveïdor "
-"d'Internet o pel govern. El navegador Tor incorpora una serie de programari "
-"per evitar-ho. Aquestes eines s'anomenen \"connectors de transport\". "
-"Consulti <a href=\"/en-US/transports\">connectors de transport</a> per a més"
-" informació del tipus de transport disponible."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -944,36 +898,24 @@ msgstr "##### QUIN TIPUS DE TRANSPORT VOL UTILITZAR?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Cadascun dels transports llistat en el menú d'iniciador Tor treballa de "
-"manera diferent (per més informació, consultar <a href=\"/en-"
-"US/transports\">connectors de transport</a> pàgina) per saber la seva "
-"efectivitat depenen de les circumstàncies individuals. "
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Si esteu intentant evitar una connexió bloquejada per primera vegada, heu de"
-" provar els diferents transports: obfs3, obfs4, fte i meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Si priva totes aquestes opcions, i cap resulta amb una connexió vàlida, "
-"haurà d'introduir una adreça de pont de forma manual. Llegeixi la secció "
-"d'aprenentatge sobre <a href=\"/en-US/bridges/\">ponts</a> per saber com "
-"fer-ho."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1071,19 +1013,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"En el circuit, la guàrdia o el node d'entrada és el primer node i és "
-"automàticament i aleatòriament seleccionat per Tor. Però, aquest, és "
-"diferent dels altres nodes del circuit. Per garantir seguretat en contra "
-"d'atacs de perfil, el node de guàrdia canvia només cada 2-3 mesos, a "
-"diferència dels altres nodes, que canvien per cada domini web. Per més "
-"informació sobre Guàrdies, consulta les <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">Preguntes més "
-"freqüents</a> i el <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Portal de Suport</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1131,12 +1064,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Consulti <a href=\"/ca/secure-connections\">Connexions segures</a> la "
-"pàgina on mostra com augmentar la seguretat en les connexions d'inici de "
-"sessió."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1204,21 +1134,14 @@ msgstr "##### NOU CIRCUIT TOR PER A AQUEST LLOC"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Aquesta opció pot ser d'ajuda si <a href=\"about-tor-browser#how-tor-"
-"works\">surt del relé</a> que està utilitzant per la connexió al lloc web "
-"que està intentant connectar. Si se selecciona farà que la pestanya o "
-"finestra activa s'actualitzi mitjançant un nou circuit Tor. Altres pestanyes"
-" i finestres obertes del mateix lloc web utilitzaran un nou circuit Tor al "
-"ser actualitzades. Aquesta opció no permet la neteja d'informació privada o "
-"desenllaçar la activitat, a més de no afectar connexions a altres lloc web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1270,12 +1193,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tot el tràfic entre els usuaris Tor i els serveis ceba és amb encriptació "
-"punt-a-punt, per tant no cal patir <a href=\"/ca/secure-connections\">de la "
-"connexió mitjançant HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1353,12 +1273,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"També podeu assegurar-vos que podeu accedir a altres serveis de onion "
-"connectant-vos al <a href=\"http://3g2upl4pq6kufc4m.onion/\">servei ceba de "
-"DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1452,19 +1368,11 @@ msgstr "##### DADES POTENCIALMENT VISIBLES"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1475,19 +1383,11 @@ msgstr "Lloc.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1498,10 +1398,6 @@ msgstr "El web visitat."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1551,10 +1447,6 @@ msgstr "Si o no, Tor s'està utilitzant."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1627,66 +1519,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "més segur"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"A aquest nivell, el vídeo de HTML5 i l'àudio esdevindrà reproduïble "
-"mitjançant un clic via NoScript; els augmentadors de rendiments seran "
-"abolits; algunes equacions matemàtiques no es mostraran correctament; alguns"
-" renderitzats de tipus de lletra seran deshabilitats; alguns tipus "
-"d'imatges; javaScript es mantindrà per defecte sense utilització; la majoria"
-" de vídeos i àudios no es reproduiran; algunes lletres i imatges no es "
-"podran visualitzar correctament."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Més segur"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"A aquest nivell, el vídeo de HTML5 i l'àudio esdevindrà reproduïble "
-"mitjançant un clic via NoScript; els augmentadors de rendiments seran "
-"abolits; algunes equacions matemàtiques no es mostraran correctament; alguns"
-" renderitzats de tipus de lletra seran deshabilitats; alguns tipus "
-"d'imatges; javaScript es mantindrà per defecte sense utilització i en-<a "
-"href=\"/ca/secure-connections\">HTTPS</a> tots els llocs."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Estàndard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"En aquest nivell, tots els navegadors i les seves característiques són "
-"activades. Aquesta és la opció més utilitzada."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1777,32 +1653,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1813,7 +1686,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1916,12 +1789,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Suprimir el navegador Tor del sistema amb la supressió de la carpeta que "
-"conté (consultar l'enllaç <a href='uninstalling'>Uninstalling</a> d'un "
-"sistema operatiu)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2016,20 +1885,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Els usuaris que requereixin un alt grau de seguretat en la seva navegació "
-"web haurien de configurar el <a href=\"security-slider\">control "
-"deslizador</a>de seguretat del navegador Tor a \"Més segur\" (que desabilita"
-" JavaScript per a llocs web que no siguin d'HTTPS) o \"Seguretat\" (que ho "
-"fa per a tots els llocs web). Tanmateix, la desactivació de JavaScript "
-"evitarà que molts llocs web es mostrin correctament, de manera que la "
-"configuració predeterminada del navegador Tor és permetre que tots els llocs"
-" web executin scripts en el mode \"Estàndard\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2148,13 +2009,9 @@ msgstr "##### ESTÀ LA SEVA CONNEXIÓ EN CENSURA?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Si continua sense poder connectar-se, el seu proveïdor d'Internet "
-"probablement està censurant les connexions a la xarxa Tor. Per a més "
-"informació <a href=\"eludir\">Circumvention</a> per trobar possibles "
-"solucions."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2165,14 +2022,9 @@ msgstr "##### ASSUMPTES CONEGUTS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"El navegador Tor està en constant desenvolupament, i alguns aspectes s'han "
-"d'arranjar en el futur. Si us plau comprovi a <a href=\"més "
-"informació\">Known Issues</a> si el problema que experimenta ha estat "
-"llistat. "
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2271,11 +2123,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent en concret <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">no és anònim sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2289,50 +2139,118 @@ msgstr "Com eliminar el navegador Tor del seu sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Desinstal·lar el navegador Tor del sistema operatiu és simple:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"El navegador no interacciona amb cap altra programari ni configuració del "
-"seu ordinador. Desinstal·lar el navegador Tor, tampoc afectarà cap paràmetre"
-" del ordinador."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Desinstal·lar el navegador Tor del sistema operatiu és simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Elimineu la carpeta o aplicació del navegador Tor."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Buida la paperera."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
-"1. Ubica la carpeta del navegador Tor. La localització per defecte a Windows"
-" és en el escriptori; en macOS és en la carpeta d'aplicacions. A Linux, no "
-"hi ha una localització prefixada, de manera que la carpeta serà anomenada "
-"\"tor-browser_en-US\" si s'utilitza la versió anglesa."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Suprimir la carpeta del navegador Tor."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Buidar la paperera"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"El sistema operatiu de forma estandarditzada la funció de \"Desinstal·lar\" "
-"no està usada."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+cs.po b/contents+cs.po
index 90f15b143..db0a34e7f 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -1,7 +1,6 @@
 # Translators:
 # trendspotter <j.podhorecky at volny.cz>, 2018
 # Mikuláš Vrba <mikulasvrba at gmail.com>, 2018
-# Michal Várady <miko.vaji at gmail.com>, 2019
 # erinm, 2019
 # David Stepan <stepand at tiscali.cz>, 2019
 # Emma Peel, 2019
@@ -11,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Michal Stanke <mstanke at mozilla.cz>, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
@@ -192,13 +191,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Ve výchozím nastavení prohlížeč Tor nedrží historii prohlížení. Cookies jsou"
-" platné pouze pro jednu relaci (dokud není prohlížeč Tor zavřen nebo dokud "
-"si nevyžádáte <a href=\"/managing-identities/#new-identity\">Novou "
-"identitu</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -410,9 +405,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -444,8 +438,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -488,12 +482,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -635,8 +628,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -646,9 +639,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -663,19 +656,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -787,9 +767,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -840,25 +819,23 @@ msgstr "##### KTERÝ TRANSPORT BYCH MĚL POUŽÍT?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -944,9 +921,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -985,8 +962,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1047,13 +1024,13 @@ msgstr "##### Nový okruh Toru pro tuto stránku"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1098,8 +1075,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1159,8 +1136,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1236,19 +1212,11 @@ msgstr "##### Potenciálně viditelné údaje"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1259,19 +1227,11 @@ msgstr "Example.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1282,10 +1242,6 @@ msgstr "Navštívené stránky."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1335,10 +1291,6 @@ msgstr "Zda je nebo není používán Tor."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1401,56 +1353,48 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Nejbezpečnější"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Na této úrovni se video a zvuky v HTML5 spouštějí až po klepnutí díky "
-"NoScriptu. Všechny optimalizace výkonu JavaScriptu jsou zakázány a některé "
-"matematické rovnice se nemusí zobrazovat správně. Některé funkce "
-"vykreslování písma jsou zakázány, stejně jako některé typy obrázků. "
-"Javascript je ve výchozím nastavení zakázán na všech stránkách a většina "
-"video a audio formátů je vypnuta. A některá písma a ikony se nemusí zobrazit"
-" správně."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Bezpečnější"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standardní"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1543,32 +1487,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1579,7 +1520,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1679,8 +1620,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1756,11 +1696,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1859,8 +1799,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1872,9 +1812,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1958,8 +1897,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1974,43 +1913,118 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Upozorňujeme, že standardní nástroj \"Odinstalace\" operačního systému se "
-"nepoužívá."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+da.po b/contents+da.po
index 7a1f5aac7..271d4e2d1 100644
--- a/contents+da.po
+++ b/contents+da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: scootergrisen, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -190,12 +190,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Tor Browser husker som standard ikke nogen browserhistorik. Cookies er kun "
-"gyldige for én session (indtil Tor Browser afsluttes eller der anmodes om en"
-" <a href=\"/managing-identities/#new-identity\">Ny identitet</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -389,9 +386,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -421,8 +417,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -460,12 +456,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -608,8 +603,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -619,9 +614,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -636,19 +631,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -758,9 +740,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -811,25 +792,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -905,9 +884,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -946,8 +925,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1002,13 +981,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1055,8 +1034,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1116,8 +1095,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1193,19 +1171,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1216,19 +1186,11 @@ msgstr "Websted"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1239,10 +1201,6 @@ msgstr "Stedet som besøges."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1292,10 +1250,6 @@ msgstr "Hvorvidt Tor er i brug."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1358,13 +1312,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Mest sikker"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1376,35 +1330,32 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Mere sikker"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"På dette niveau er alle browserfaciliteter aktiveret. Dette er den mest "
-"nyttige valgmulighed."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1495,32 +1446,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1531,7 +1479,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1624,8 +1572,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1708,11 +1655,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1813,8 +1760,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1826,9 +1773,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1912,8 +1858,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1928,41 +1874,118 @@ msgstr "Sådan fjernes Tor Browser fra dit system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "Bemærk at dit styresystems standard-\"Afinstaller\"-værktøj ikke bruges."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+de.po b/contents+de.po
index 28e09d488..f1b9e895d 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,18 +1,18 @@
 # Translators:
 # Jim John <transifex at exware.de>, 2018
-# erinm, 2019
 # Marcel Haring <getting at autistici.org>, 2019
 # Emma Peel, 2019
 # Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
 # c8faa9c4b9d81319c5c2fd62ae3a9956, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: c8faa9c4b9d81319c5c2fd62ae3a9956, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,13 +197,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Normalerweise speichert der Tor Browser keinen Verlauf. Cookies sind nur für"
-" eine einzige Sitzung gültig (bis der Tor Browser geschlossen wird oder um "
-"eine <a href=\"/de/managing-identities/#neue-identitt\">neue Identität</a> "
-"gebeten wird)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -433,17 +429,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
-msgstr ""
-"In den meisten Fällen kannst du dich ohne weitere Konfiguration durch das "
-"Wählen von \"Verbinden\" mit dem Tor Netzwerk verbinden. Nach dem Klicken "
-"wird eine Fortschrittsanzeige eingeblendet, die den Verbindungsprozess "
-"anzeigt. Wenn du über eine relativ schnelle Verbindung verfügst, aber die "
-"Fortschrittsanzeige an einem bestimmten Punkt festzuhängen scheint, schaue "
-"bitte auf der Seite <a href=\"/troubleshooting\">Fehlerbehebung</a> für "
-"weitere Hilfe um dieses Problem zu beheben."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -475,16 +463,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Die erste Anzeige fragt, ob der Zugriff auf das Tor Netzwerk auf deiner "
-"Verbindung blockiert oder zensiert wird. Wenn du nicht glaubst, dass dies "
-"der Fall ist, wähle \"Nein\". Wenn du weisst, dass deine Verbindung zensiert"
-" wird, oder du bereits versucht hast dich mit dem Tor Netzwerk zu verbinden "
-"und keine andere Möglichkeit funktioniert hat, wähle \"Ja\". Du wirst "
-"anschließend zum Fenster <a href=\"/circumvention\">Umgehungsmaßnahmen </a> "
-"geleitet, um eine andere Übertragungsart zu konfigurieren."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -529,20 +510,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Die meisten <a href=\"/transports\">austauschbaren Übertragungsarten</a> wie"
-" obfs3 und obfs 4 sind auf das Benutzen von \"Brücken\"-Relays angewiesen. "
-"Wie normale Tor-Relays werden Brücken von ehrenamtlichen Helfern betrieben. "
-"Im Gegensatz zu normalen Relays sind diese jedoch nicht öffentlich gelistet,"
-" sodass sie von einem Angreifer nicht so einfach identifiziert werden "
-"können. Brücken in Kombination mit austauschbaren Übertragungsarten zu "
-"verwenden hilft, zu verbergen dass du Tor benutzt."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -716,8 +689,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -727,14 +700,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 lässt den Tor-Verkehr zufällig aussehen, sodass er nicht wie Tor oder "
-"ein anderes Protokoll aussieht. Obwohl immer noch standardmäßig enthalten, "
-"wird empfohlen stattdessen obfs4 zu verwenden, da es mehrere "
-"Sicherheitsverbesserungen gegenüber obfs3 aufweist."
+"obfs4 lässt den Tor-Verkehr zufällig aussehen wie obfs3 und behindert auch "
+"Zensoren beim Finden von Brücken durch das Scannen des Internets. "
+"obfs4-Brücken sind weniger wahrscheinlich blockiert als obfs3-Brücken."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -748,22 +720,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 lässt den Tor-Verkehr zufällig aussehen wie obfs3 und behindert auch "
-"Zensoren beim Finden von Brücken durch das Scannen des Internets. "
-"obfs4-Brücken sind weniger wahrscheinlich blockiert als obfs3-Brücken."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -896,16 +852,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Der direkte Zugang zum Tor Netzwerk ist eventuell durch deinen "
-"Internetdienstanbieter oder die Regierung blockiert. Der Tor Browser enthält"
-" einige Werkzeuge, um diese Blockaden zu umgehen. Diese Werkzeugt werden "
-"\"austauschbare Übertragungsarten\" genannt. Schaue auf der Seite für <a "
-"href=\"/en-US/transports\">austauschbare Übertragungsarten</a> für mehr "
-"Informationen über die Typen von zur Zeit verfügbaren Übertragungsarten."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -965,37 +914,24 @@ msgstr "##### WELCHE ÜBERTRAGUNGSART SOLL ICH VERWENDEN?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Jede der im Tor Starter aufgeführten austauschbaren Übertragungsarten "
-"arbeitet auf eine unterschiedliche Weise (für mehr Informationen sieh dir "
-"die Seite <a href=\"/en-US/transports\">austauschbare Übertragungsarten</a> "
-"an) und ihre Effektivität hängt von deinen individuellen Umständen ab."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Wenn du zum ersten Mal versuchst, eine blockierte Verbindung zu umgehen, "
-"solltest du die verschiedenen Übertragungsarten ausprobieren: obfs3, obfs4, "
-"fte und meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Wenn du alle diese Optionen ausprobierst und keine davon dich online bringt,"
-" musst du die Brücken-Adressen manuell eingeben. Lies den Abschnitt <a href"
-"=\"/en-US/bridges/\">Brücken</a>, um zu erfahren, was Brücken sind und wie "
-"du sie erhalten kannst."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1097,18 +1033,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"In der Schaltung ist der Guard oder Einstiegsknoten der erste Knoten und "
-"wird automatisch und zufällig von Tor ausgewählt. Aber es unterscheidet sich"
-" von den anderen Knoten in der Schaltung. Um Profilangriffe zu vermeiden, "
-"ändert sich der Guard-Knoten erst nach 2-3 Monaten, im Gegensatz zu den "
-"anderen Knoten, die sich mit jeder neuen Domain ändern. Weitere "
-"Informationen über Guards finden Sie in den <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> und im <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1158,12 +1086,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Schaue auf der Seite <a href=\"/secure-connections\">Sichere "
-"Verbindungen</a> für weitere, wichtige Informationen wie du deine Verbindung"
-" sichern kannst, wenn du dich anmeldest."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1234,23 +1159,14 @@ msgstr "###### NEUER TOR-KANAL FÜR DIESEN STANDORT"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Diese Option ist hilfreich wenn der von Ihnen verwendete <a href=\"/about"
-"/#how-tor-works\">Exit-Relay</a> nicht in der Lage ist, sich mit der von "
-"Ihnen gewünschten Internetseite zu verbinden oder diese nicht korrekt lädt. "
-"Wenn Sie dies auswählen wird dafür sorgen dass die aktuell geöffneten Reiter"
-" oder Fenster über einen neuen Schaltkreis neu geladen werden. Andere offene"
-" Reiter und Fenster werden den neuen Schaltkreis ebenfalls benutzen nachdem "
-"sie neu geladen wurden. Diese Option löscht keine privaten Informationen "
-"oder Verbindungen zwischen Ihren Aktivitäten und betrifft auch nicht die "
-"aktuellen Verbindungen mit anderen Internetseiten."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1303,12 +1219,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Jeglicher Verkehr zwischen Tor Benutzern und Onion Diensten ist Ende-zu-"
-"Ende verschlüsselt, sodass du dich um die <a href=\"/secure-"
-"connections\">Verbindung über HTTPS</a> keine Sorgen machen musst."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1387,12 +1300,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Du kannst auch sicherstellen, dass andere .onion-Dienste erreichbar sind, "
-"z.B. der  <a href=\"http://3g2upl4pq6kufc4m.onion/\">Onion-Dienst von "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1486,19 +1395,11 @@ msgstr "##### POTENZIELL SICHTBARE DATEN"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1509,19 +1410,11 @@ msgstr "seite.de"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1532,10 +1425,6 @@ msgstr "Die besuchte Seite."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1585,10 +1474,6 @@ msgstr "Ob Tor verwendet wird oder nicht."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1663,67 +1548,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Am sichersten"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Auf diesem Level werden HTML5-Videos und -Audios durch Click-to-play via "
-"NoScript abspielbar; alle JavaScript Geschwindigkeitsoptimierungen sind "
-"deaktiviert; einige mathematische Gleichungen werden eventuell nicht korrekt"
-" angezeigt; die Wiedergabe einiger Schriftarten ist deaktiviert; bestimmte "
-"Bilder werden nicht angezeigt; JavaScript ist standardmäßig auf allen "
-"Internetseiten deaktiviert; die meisten Video- und Audio-Formate sind "
-"deaktiviert; einige Schriftarten und Icons werden eventuell nicht korrekt "
-"angezeigt."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Sicherer"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Auf diesem Level werden HTML5-Video und -Audio durch click-to-play via "
-"NoScript abspielbar; alle JavaScript Geschwindigkeitsoptimierungen sind "
-"deaktiviert; einige mathematische Gleichungen werden eventuell nicht korrekt"
-" angezeigt; die Wiedergabe einiger Schriftarten ist deaktiviert; einige "
-"Bilder werden nicht angezeigt; und JavaScript ist für alle nicht-<a href"
-"=\"/secure-connections\">HTTPS</a> Internetseiten deaktiviert."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Auf dieser Stufe sind alle Browserfunktionen aktiviert. Dies ist die am "
-"meisten brauchbare Option."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1838,44 +1706,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Auf dieser Ebene sind alle Funktionen des Tor-Browsers und der Webseite "
-"aktiviert."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-"Diese Stufe deaktiviert Funktionen der Webseite, die oft gefährlich sind."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Dies kann dazu führen, dass einige Internetseiten ihre Funktionalität "
-"verlieren."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript ist auf allen Nicht-<a href=\"/secure-"
-"connections\">HTTPS</a>-Seiten deaktiviert; einige Schriften und "
-"mathematische Symbole sind deaktiviert; Ton und Bild (HTML5-Medien) sind "
-"Click-to-Play."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Diese Stufe erlaubt nur Funktionen der Webseite, die für statische Seiten "
-"und Basisdienste erforderlich sind."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1885,13 +1739,10 @@ msgstr "Diese Änderungen betreffen Bilder, Medien und Skripte."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript ist standardmäßig auf allen Webseiten deaktiviert; einige "
-"Schriften, Symbole, mathematische Symbole und Bilder sind deaktiviert; Ton "
-"und Bild (HTML5-Medien) sind Click-to-Play."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1995,12 +1846,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Deinstalliere den Tor Browser indem du den beinhaltenden Ordner löschst "
-"(Schaue auf der Seite <link xref=\"uninstalling\">Deinstallieren</link> für "
-"weitere Informationen)"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2097,19 +1944,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Benutzer, die ein hohes Maß an Sicherheit beim Surfen im Internet benötigen,"
-" sollten den <a href=\"/security-slider\">Security Slider</a> von Tor "
-"Browser auf \"Safer\" (deaktiviert JavaScript für Nicht-HTTPS-Websites) oder"
-" \"Safest\" (tut dies für alle Websites) einstellen. Das Deaktivieren von "
-"JavaScript verhindert jedoch, dass viele Websites korrekt angezeigt werden. "
-"Daher ist es die Standardeinstellung von Tor Browser, dass alle Websites "
-"Skripte im \"Standard\"-Modus ausführen können."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2233,13 +2073,9 @@ msgstr "##### IST DEINE VERBINDUNG ZENSIERT?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Wenn du dich noch immer nicht verbinden kannst, ist es möglich dass dein "
-"Internetdienstanbieter Verbindungen zum Tor Netzwerk zensiert. Lese den "
-"Abschnitt <a href=\"/circumvention\">Umgehungsmaßnahmen</a>, um mögliche "
-"Lösungen zu erhalten."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2250,14 +2086,9 @@ msgstr "##### BEKANNTE PROBLEME"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Der Tor Browser wird ständig weiterentwickelt, und einige Probleme sind zwar"
-" bekannt, aber bisher noch nicht behoben. Bitte sieh auf der Seite  <a href"
-"=\"/known-issues\">Bekannte Probleme</a> nach, ob das Problem, dass bei dir "
-"auftritt, dort bereits aufgelistet ist."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2356,11 +2187,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent im Besonderen ist <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">nicht anonym über Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2374,50 +2203,118 @@ msgstr "So entfernst du den Tor-Browser von deinem System"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Das Entfernen des Tor-Browsers von deinem System ist einfach:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Der Tor Browser beeinträchtigt keine andere existierende Anwendung oder "
-"Einstellungen auf deinem Computer. Das Deinstallieren des Tor Browsers wird "
-"sich nicht auf die Anwendungen oder Einstellungen deines Systems auswirken."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Das Entfernen des Tor-Browsers von deinem System ist einfach:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Lösche den Ordner von Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Leere deinen Papierkorb."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Suche deinen Tor Browser-Ordner. Der Standardordner unter Windows ist der"
-" Desktop; unter MacOS ist es der Ordner Anwendungen. Unter Linux gibt es "
-"keinen Standardspeicherort, jedoch wird der Ordner \"tor-browser_en-US\" "
-"genannt, wenn du den englischen Tor Browser verwendest."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Lösche den Tor-Browser-Ordner."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Leere deinen Papierkorb"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Beachte, dass das standardmäßige Dienstprogramm \"Uninstall\" deines "
-"Betriebssystems nicht verwendet wird."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+el.po b/contents+el.po
index fc85853da..5e4ef6448 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2,16 +2,16 @@
 # Elektra M. <safiragon at yahoo.gr>, 2018
 # A Papac <ap909219 at protonmail.com>, 2018
 # Panagiotis Vasilopoulos, 2018
-# erinm, 2019
 # Adrian Pappas <pappasadrian at gmail.com>, 2019
 # Emma Peel, 2019
+# erinm, 2019
 # Sofia K., 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Sofia K., 2019\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -197,13 +197,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Από προεπιλογή, ο Tor Browser δεν κρατά κανένα ιστορικό περιήγησης. Τα "
-"cookies είναι έγκυρα μόνο για μια συνεδρία (μέχρι να κλείσει ο Tor Browser ή"
-" να ζητηθεί μια <a href=\"/managing-identities/#new-identity\">Νέα "
-"Ταυτότητα</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -430,17 +426,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
-msgstr ""
-"Στις περισσότερες περιπτώσεις, επιλέγοντας τη \"Σύνδεση\" θα σας επιτρέψει "
-"να συνδεθείτε στο δίκτυο Tor χωρίς περαιτέρω παραμετροποίηση. Όταν το "
-"πατήσετε, θα εμφανιστεί μια μπάρα κατάστασης που θα σας δείχνει την πορεία "
-"της σύνδεσης του Tor. Αν χρησιμοποιείτε μια αρκετά γρήγορη σύνδεση στο "
-"διαδίκτυο αλλά αυτή η μπάρα φαίνεται να έχει κολλήσει σε κάποιο σημείο, "
-"δείτε την σελίδα <a href=\"troubleshooting\">Αντιμετώπιση προβλημάτων</a> "
-"για βοήθεια για την επίλυση του προβλήματος"
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -472,16 +460,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Η πρώτη οθόνη ρωτά εάν η πρόσβαση στο δίκτυο Tor είναι αποκλεισμένη ή "
-"λογοκρίνεται η σύνδεσή σας. Εάν δεν πιστεύετε ότι συμβαίνει αυτό, επιλέξτε "
-"\"Όχι\". Αν γνωρίζετε ότι η σύνδεσή σας υπόκειται σε λογοκρισία ή έχετε "
-"δοκιμάσει και αποτύχατε να συνδεθείτε στο δίκτυο Tor και δεν έχει δουλέψει "
-"καμία άλλη λύση, επιλέξτε \"Ναι\". Στη συνέχεια, θα μεταφερθείτε στην οθόνη "
-"<a href=\"circumvention\">Παράκαμψη</a> για να διαμορφώσετε ένα pluggable "
-"transport.."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -526,20 +507,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Τα περισσότερα <a href=\"transports\">Pluggable Transports</a>, όπως το "
-"obfs3 και το obfs4, βασίζονται στη χρήση κόμβων \"γέφυρας\". Όπως και με "
-"τους συνηθισμένους κόμβους Tor, οι γέφυρες διαχειρίζονται από εθελοντές. "
-"αντίθετα από τους συνηθισμένους κόμβους, ωστόσο, δεν καταχωρούνται δημόσια, "
-"οπότε ο αντίπαλος δεν μπορεί να τα αναγνωρίσει εύκολα. Η χρήση γεφυρών σε "
-"συνδυασμό με τα pluggable transports βοηθά να συγκαλύψει το γεγονός ότι "
-"χρησιμοποιείτε Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -706,8 +679,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -717,14 +690,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"Το obfs3 κάνει την κίνηση στον Tor να μοιάζει τυχαία κι έτσι δεν μοιάζει με "
-"τον Tor ή με κάποιο άλλο πρωτόκολο. Παρ' όλο που έχει τεθεί ως προεπιλογή, "
-"συνιστάται να χρησιμοποιείται αντί αυτού το obfs4 , επειδή έχει πολλές "
-"βελτιώσεις συγκριτικά με τον obfs3."
+"Ο obfs4 κάνει την κίνηση του Tor να μοιάζει τυχαία όπως ο obfs3 και "
+"ταυτόχρονα δεν επιτρέπει σε λογοκριτές να βρίσκουν τις γέφυρες σκανάροντας "
+"το διαδίκτυο. Οι γέφυρες του obfs4 είναι πολύ λιγότερο πιθανό να "
+"μπλοκαριστούν απ' ότι οι γέφυρες του obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -738,23 +711,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"Ο obfs4 κάνει την κίνηση του Tor να μοιάζει τυχαία όπως ο obfs3 και "
-"ταυτόχρονα δεν επιτρέπει σε λογοκριτές να βρίσκουν τις γέφυρες σκανάροντας "
-"το διαδίκτυο. Οι γέφυρες του obfs4 είναι πολύ λιγότερο πιθανό να "
-"μπλοκαριστούν απ' ότι οι γέφυρες του obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -870,16 +826,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Η άμεση πρόσβαση στο δίκτυο Tor μπορεί μερικές φορές να παρεμποδίζεται από "
-"τον Πάροχο Υπηρεσιών Διαδικτύου (ISP) ή από κάποια κυβέρνηση. Ο Tor Browser "
-"περιλαμβάνει ορισμένα εργαλεία για την παράκαμψη των φραγμών αυτών. Αυτά τα "
-"εργαλεία ονομάζονται \"pluggable transports\". Για περισσότερες πληροφορίες "
-"σχετικά με τους τύπους των transport που είναι διαθέσιμα αυτήν τη στιγμή, "
-"ανατρέξτε στη σελίδα <a href=\"/en-US/transports\">Pluggable Transports</a>."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -929,34 +878,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Κάθε ένα από τα transports που αναγράφονται στο μενού του Tor Launcher "
-"λειτουργεί με διαφορετικό τρόπο (για περισσότερες λεπτομέρειες, ανατρέξτε "
-"στη σελίδα <a href=\"/en-US/transports\">Pluggable Transports</a>) και η "
-"αποτελεσματικότητά τους εξαρτάται από την περίπτωσή σας."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"* Αν δοκιμάσετε όλες αυτές τις λύσεις, και παρ' όλα αυτά δεν καταφέρατε να "
-"συνδεθείτε, θα χρειαστεί να καταχωρίσετε χειροκίνητα τις διευθύνσεις "
-"γέφυρας. Διαβάστε την ενότητα <a href=\"/en-US/bridges/\"> Γέφυρες</a> για "
-"να μάθετε τι είναι οι γέφυρες και πώς να τις αποκτήσετε."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1057,19 +996,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Στο κύκλωμα, ο φύλακας κόμβος ή ο εισακτέος κόμβος είναι ο πρώτος κόμβος και"
-" επιλέγεται αυτόματα και τυχαία από το Tor. Όμως, διαφέρουν από τους άλλους "
-"κόμβους στο κύκλωμα. Για να αποφευχθούν επιθέσεις ταυτοποίησης, ο φύλακας "
-"κόμβος αλλάζει μόνο μετά από 2-3 μήνες, σε αντίθεση με τους υπόλοιπους "
-"κόμβους, οι οποίοι αλλάζουν με κάθε νέο όνομα τομέα. Για περισσότερες "
-"πληροφορίες για τους φύλακες κόμβους, δείτε τις <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">Συχνές "
-"Ερωτήσεις</a> ή την <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Πήλη Υποστήριξης</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1119,12 +1049,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Ανατρέξτε στη σελίδα <a href=\"/el/secure-connections\">Ασφαλείς "
-"Συνδέσεις</a> για σημαντικές πληροφορίες σχετικά με το πως να ασφαλίσετε τη "
-"σύνδεσή σας όταν συνδέεστε."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1195,22 +1122,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Αυτή η επιλογή είναι χρήσιμη εάν ο <a href=\"/about/#how-tor-works\">κόμβος "
-"εξόδου</a> που χρησιμοποιείτε δεν είναι σε θέση να συνδεθεί στην ιστοσελίδα "
-"που χρειάζεστε ή δεν την φορτώνει σωστά. Η επιλογή του θα προκαλέσει την "
-"επαναφόρτωση της τρέχουσας καρτέλας ή του παραθύρου μέσω ενός νέου "
-"κυκλώματος Tor. Άλλες ανοιχτές καρτέλες και παράθυρα από την ίδια ιστοσελίδα"
-" θα χρησιμοποιήσουν το νέο κύκλωμα μόλις φορτωθούν ξανά. Αυτή η επιλογή δεν "
-"εκκαθαρίζει καμία ιδιωτική πληροφορία ούτε αποσυνδέει τη δραστηριότητά σας, "
-"ούτε επηρεάζει τις τρέχουσες συνδέσεις σας με άλλες ιστοσελίδες."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1264,12 +1183,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"Όλη η κίνηση μεταξύ των χρηστών του Tor και των υπηρεσιών onion είναι "
-"κρυπτογραφημένη από άκρο σε άκρο, οπότε δεν χρειάζεται να ανησυχείτε για τη "
-"<a href=\"/el/secure-connections\">σύνδεση μέσω HTTPS.</a>"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1348,12 +1264,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Μπορείτε επίσης να εξασφαλίσετε ότι έχετε πρόσβαση σε άλλες υπηρεσίες onion,"
-" με σύνδεση στο <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's "
-"Onion Service</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1449,19 +1361,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1472,19 +1376,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1495,10 +1391,6 @@ msgstr "Η ιστοσελίδα που επισκέπτεστε."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1548,10 +1440,6 @@ msgstr "Αν χρησιμοποιείται Tor ή όχι."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1625,68 +1513,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Ασφαλέστατο"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Σε αυτό το επίπεδο, τα πολυμέσα βίντεο και ήχου HTML5 γίνονται κλικ-για-"
-"αναπαραγωγή μέσω του NoScript· όλες οι βελτιστοποιήσεις απόδοσης JavaScript "
-"είναι απενεργοποιημένες· ορισμένες μαθηματικές εξισώσεις μπορεί να μην "
-"εμφανίζονται σωστά· ορισμένες λειτουργίες γραμματοσειράς είναι "
-"απενεργοποιημένες· ορισμένοι τύποι εικόνων είναι απενεργοποιημένοι· Η "
-"Javascript είναι απενεργοποιημένη από προεπιλογή σε όλες τις ιστοσελίδες· οι"
-" περισσότερες μορφές βίντεο και ήχου είναι απενεργοποιημένες· και ορισμένες "
-"γραμματοσειρές και εικονίδια ενδέχεται να μην εμφανίζονται σωστά."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Ασφαλέστερα"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Σε αυτό το επίπεδο, τα πολυμέσα βίντεο και ήχου HTML5 γίνονται κλικ-για-"
-"αναπαραγωγή μέσω του NoScript· όλες οι βελτιστοποιήσεις απόδοσης JavaScript "
-"είναι απενεργοποιημένες· ορισμένες μαθηματικές εξισώσεις μπορεί να μην "
-"εμφανίζονται σωστά· ορισμένες λειτουργίες γραμματοσειράς είναι "
-"απενεργοποιημένες· ορισμένοι τύποι εικόνων είναι απενεργοποιημένοι· και η "
-"JavaScript είναι απενεργοποιημένη από προεπιλογή σε όλες τις ιστοσελιδες που"
-" δεν υποστηρίζουν <a href=\"/el/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Βασικό"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Σε αυτό το επίπεδο, όλες οι λειτουργίες του browser είναι ενεργοποιημένες. "
-"Αυτή είναι η πιο εύχρηστη επιλογή."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1777,32 +1647,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1813,7 +1680,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1919,12 +1786,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Αφαιρέστε τον Tor Browser από το σύστημά σας διαγράφοντας το φάκελο που τον "
-"περιέχει (ανατρέξτε στην ενότητα <a href='uninstalling'>Απεγκατάσταση</a> "
-"για περισσότερες πληροφορίες)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2019,19 +1882,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Χρήστες που επιθυμούν υψηλό βαθμό ασφάλειας κατά την περιήγησή τους στο "
-"διαδίκτυο, μπορούν να αλλάξουν τον <a href=\"/security-slider\">Slider "
-"Ασφαλείας</a>του περιηγητή Tor στο \"Ασφαλέστερα\" (το οποίο εφαρμόζεται σε "
-"όλες τις ιστοσελίδες). Παρ' όλα αυτά, η απενεργοποίηση των JavaScript θα "
-"αποτρέψει πολλές ιστοσελίδες από την κανονική τους λειτουργία, γι' αυτό η "
-"αυτόματη ρύθμιση του περιηγητή Tor είναι να επιτρέπει σε όλες τις "
-"ιστοσελίδες να λειτουργούν θέτοντας αυτόματα το \"Κανονικό\" προφίλ."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2153,13 +2009,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Εάν εξακολουθείτε να μην μπορείτε να συνδεθείτε, ο Πάροχος Υπηρεσιών "
-"Διαδικτύου (ISP) ενδέχεται να λογοκρίνει τις συνδέσεις στο δίκτυο Tor. "
-"Διαβάστε την ενότητα <a href=\"circumvention\">Παράκαμψη</a> για πιθανές "
-"λύσεις."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2170,14 +2022,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Ο περιηγητής Tor είναι συνεχώς υπό κατασκευή και κάποια ζητήματα μας είναι "
-"γνωστά αλλά δεν έχουν λυθεί ακόμη. Παρακαλούμε, δες τη σελίδα<a href"
-"=\"known-issues\">Γνωστά Ζητήματα</a>για να επιβεβαιώσεις αν το ζήτημα που "
-"αντιμετωπίζεις βρίσκεται ήδη στη λίστα μας."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2276,12 +2123,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Το BitTorrent συγκεκριμένα <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">δεν είναι ανώνυμο μέσω του "
-"Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2295,47 +2139,119 @@ msgstr "Πώς να καταργήσετε τον Tor Browser από το σύσ
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+"Η διαδικασία κατάργησης του Tor Browser από το σύστημά σας είναι απλή:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Ο Tor Browser δεν επηρεάζει το υπάρχον λογισμικό ή τις ρυθμίσεις του "
-"υπολογιστή σας. Η απεγκατάσταση του Tor Browser δεν θα επηρεάσει το "
-"λογισμικό ή τις ρυθμίσεις του συστήματός σας."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Διάγραψε τον φάκελο ή την εφαρμογή του Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Αδειάστε τον Κάδο Απορριμάτων σας"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
 msgstr ""
-"Η διαδικασία κατάργησης του Tor Browser από το σύστημά σας είναι απλή:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Διαγραφή του φακέλου του Tor Browser"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Αδειάστε τον Κάδο Απορριμάτων σας"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Θυμηθείτε πως δεν χρησιμοποιείται η συνηθισμένη λειτουργία \"Απεγκατάσταση\""
-" του λειτουργικού σας συστήματος."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+en-GB.po b/contents+en-GB.po
index 8b96c32fc..2cd8ac1ad 100644
--- a/contents+en-GB.po
+++ b/contents+en-GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Andi Chandler <andi at gowling.com>, 2019\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -181,8 +181,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -384,9 +384,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -419,8 +418,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -463,12 +462,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -619,8 +617,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -630,10 +628,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -647,22 +648,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -774,9 +759,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -827,25 +811,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -943,9 +925,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -993,8 +975,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1055,13 +1037,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1110,8 +1092,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1174,8 +1156,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1259,19 +1240,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1282,19 +1255,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1305,10 +1270,6 @@ msgstr "The site being visited."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1358,10 +1319,6 @@ msgstr "Whether or not Tor is being used."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1431,59 +1388,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Safest"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"At this level, HTML5 video and audio media become click-to-play via "
-"NoScript; all JavaScript performance optimisations are disabled; some "
-"mathematical equations may not display properly; some font rendering "
-"features are disabled; some types of image are disabled; Javascript is "
-"disabled by default on all sites; most video and audio formats are disabled;"
-" and some fonts and icons may not display correctly."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Safer"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"At this level, all browser features are enabled. This is the most usable "
-"option."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1574,32 +1522,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1610,7 +1555,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1714,8 +1659,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1804,11 +1748,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1919,8 +1863,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1932,9 +1876,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2018,8 +1961,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2034,45 +1977,118 @@ msgstr "How to remove Tor Browser from your system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+en.po b/contents+en.po
index 6eb7bd87e..f7f3d8123 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: en <LL at li.org>\n"
@@ -184,12 +184,12 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -415,16 +415,14 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -456,15 +454,15 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 "The first screen asks if access to the Tor network is blocked or censored on"
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -508,19 +506,17 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -689,8 +685,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -700,13 +696,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -720,22 +716,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -863,16 +843,14 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -931,36 +909,32 @@ msgstr "##### WHICH TRANSPORT SHOULD I USE?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1057,17 +1031,17 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 "In the circuit, the Guard or entry node is the first node and it's "
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1114,11 +1088,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1186,21 +1160,21 @@ msgstr "###### NEW TOR CIRCUIT FOR THIS SITE"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1252,12 +1226,12 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1334,12 +1308,10 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1430,19 +1402,11 @@ msgstr "##### POTENTIALLY VISIBLE DATA"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1453,19 +1417,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1476,10 +1432,6 @@ msgstr "The site being visited."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1529,10 +1481,6 @@ msgstr "Whether or not Tor is being used."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1603,20 +1551,20 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Safest"
+msgid "###### Safest"
+msgstr "###### Safest"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1627,40 +1575,38 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Safer"
+msgid "###### Safer"
+msgstr "###### Safer"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr "###### Standard"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1774,38 +1720,37 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr "* At this level, all Tor Browser and website features are enabled."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "This level disables website features that are often dangerous."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1815,11 +1760,11 @@ msgstr "These changes affect images, media, and scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 
@@ -1922,12 +1867,10 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2021,18 +1964,18 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2152,12 +2095,12 @@ msgstr "##### IS YOUR CONNECTION CENSORED?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2168,14 +2111,12 @@ msgstr "##### KNOWN ISSUES"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2271,11 +2212,11 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2289,49 +2230,138 @@ msgstr "How to remove Tor Browser from your system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Removing Tor Browser from your system is simple:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr "On Windows:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Delete the Tor Browser folder or application."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Empty your Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr "On macOS:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr "* Move the Tor Browser application to Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr "* Go to your `~/Library/Application Support/` folder."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
 msgstr ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Delete the Tor Browser folder."
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr "* Locate the TorBrowser-Data folder and move it to Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr "On Linux:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
+msgstr "* Delete the Tor Browser folder."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+es-AR.po b/contents+es-AR.po
index 1f37c9816..6e36aef11 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -194,13 +194,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Por defecto, el Navegador Tor no guarda ningún historial de navegación. Las "
-"Cookies son válidas para una sola sesión (hasta que el Navegador Tor sea "
-"cerrado o una <a href=\"/managing-identities/#new-identity\">Nueva "
-"Identidad</a> sea solicitada)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -423,17 +419,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
-msgstr ""
-"En la mayoría de los casos, eligiendo \"Conectar\" te permitirá conectar a "
-"la red de Tor sin ninguna configuración ulterior. Una vez cliqueado, "
-"aparecerá una barra de estado, mostrando el progreso de conexión de Tor. Si "
-"estás en una conexión relativamente rápida, pero esta barra pareciera quedar"
-" trabada en cierto punto, mirá la página <a "
-"href=\"/troubleshooting\">Resolución de problemas</a> por ayuda en cómo "
-"resolver el problema."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -465,16 +453,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"La primera pantalla pregunta si el acceso a la red de Tor está bloqueado o "
-"censurado en tu conexión. Si no creés que éste es el caso, seleccioná "
-"\"No\". Si sabés que tu conexión está censurada, o has intentado y fallado "
-"en conectar a la red de Tor y ninguna otra posibilidad ha funcionado, "
-"seleccioná \"Sí\". Luego serás llevado a la pantalla <a "
-"href=\"/circumvention\">Evitar obstáculos</a> para configurar un transporte "
-"insertable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -518,20 +499,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"La mayoría de los <a href=\"/transports\">transportes insertables</a>, tales"
-" como obfs3 y obfs4, se apoyan para su funcionamiento en el uso de relevos "
-"\"puente\". Como los relevos Tor ordinarios, los puentes son operados por "
-"voluntarios; sin embargo, y a diferencia de éstos, no son listados "
-"públicamente, por lo que un adversario no puede identificarlos fácilmente. "
-"Usando puentes en combinación con transportes insertables ayuda a enmascarar"
-" el hecho de que estás usando Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -701,8 +674,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -712,14 +685,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obsf3 hace que el tráfico de Tor parezca aleatorio, de manera que no luzca "
-"como el protocolo de Tor, ni ningún otro protocolo. Aunque aún se lo incluye"
-" de forma predeterminada, se recomienda utilizar en su lugar obsf4, ya que "
-"posee varias mejoras de seguridad sobre obsf3."
+"obfs4 hace que el tráfico Tor luzca aleatorio como obfs3, y también previene"
+" que los censores encuentren puentes mediante el escaneo de Internet. "
+"Puentes obfs4 son menos probables de ser bloqueados que puentes obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -733,22 +705,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 hace que el tráfico Tor luzca aleatorio como obfs3, y también previene"
-" que los censores encuentren puentes mediante el escaneo de Internet. "
-"Puentes obfs4 son menos probables de ser bloqueados que puentes obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -878,16 +834,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"El acceso directo a la red de Tor puede ser bloqueado a veces por tu "
-"Proveedor de Servicio de Internet o por un gobierno. El Navegador Tor "
-"incluye algunas herramientas para evitar estos obstáculos. Estas "
-"herramientas son llamadas \"transportes insertables\". Mirá la página <a "
-"href=\"/en-US/transports\">Transportes Insertables</a> para más información "
-"sobre qué tipos de transporte están actualmente disponibles."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -948,36 +897,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Cada uno de los transportes listados en el menú del Lanzador de Tor trabaja "
-"de una manera diferente (para más detalles, mirá la página <a href=\"/en-"
-"US/transports\">Transportes Insertables</a>), y su efectividad depende de "
-"tus circunstancias individuales."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Si estás tratando de eludir una conexión bloqueada por primera vez, deberías"
-" intentar los diferentes transportes; obfs3, obfs4, fte, y meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Si tratás todas éstas opciones, y ninguna de ellas te permite estar en "
-"línea, necesitarás entrar direcciones de puente manualmente. Leé la sección "
-"<a href=\"/en-US/bridges/\">Puentes</a> para aprender qué son los puentes y "
-"cómo obtenerlos."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1078,18 +1015,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"En el circuito, la Guarda o nodo de entrada es el primer nodo, y es "
-"seleccionado al azar automáticamente por Tor. Pero es diferente de los otros"
-" nodos en el cicuito. En orden a evitar ataques por perfilación, el nodo "
-"Guarda cambia sólo luego de 2-3 meses, a diferencia de los otros nodos, que "
-"cambian con cada nuevo dominio. Para más información acerca de Guardas, "
-"consultá <a href=\"https://www.torproject.org/docs/faq#EntryGuards\">PMF</a>"
-" y <a href=\"https://support.torproject.org/tbb/tbb-2/\">Portal de "
-"Soporte</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1138,12 +1067,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Mirá la página <a href=\"/secure-connections\">Conexiones Seguras</a> por "
-"información importante sobre cómo asegurar tu conexión cuando estés "
-"iniciando sesión."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1213,22 +1139,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Esta opción es útil si el <a href=\"/about/#how-tor-works\">relevo de "
-"salida</a> que estás usando es incapaz de conectar al sitio web que "
-"requerís, o no lo está cargando apropiadamente. Seleccionándola causará que "
-"la pestaña o ventana actualmente activa sea recargada sobre un nuevo "
-"circuito Tor. Otras pestañas y ventanas abiertas desde el mismo sitio web "
-"usarán también el nuevo circuito, una vez que sean recargadas. Esta opción "
-"no limpia ninguna información privada o desvincula tu actividad, ni tampoco "
-"afecta tus conexiones actuales a otros sitios web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1281,12 +1199,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Todo el tráfico entre usuarios de Tor y servicios onion está encriptado "
-"punto a punto, por lo que no tenés que preocuparte acerca de <a href"
-"=\"/secure-connections\">conectarte sobre HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1364,12 +1279,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Podés también asegurarte que seas capaz de acceder otros servicios onion "
-"conectándote al <a href=\"http://3g2upl4pq6kufc4m.onion/\">servicio onion de"
-" DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1463,19 +1374,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1486,19 +1389,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1509,10 +1404,6 @@ msgstr "El sitio siendo visitado."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1562,10 +1453,6 @@ msgstr "Si Tor está o no siendo usado."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1639,68 +1526,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "El más seguro"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"A éste nivel, medios de video y audio HTML5 se transforman en cliquear-para-"
-"reproducir vía NoScript; todas las optimizaciones de rendimiento de "
-"JavaScript son deshabilitadas; algunas ecuaciones matemáticas pueden no "
-"mostrarse apropiadamente; algunas características de presentación de tipo de"
-" letras son deshabilitadas; algunos tipos de imágenes están deshabilitados; "
-"JavaScript está deshabilitado por defecto en todos los sitios; la mayoría de"
-" los formatos de video y audio están deshabilitados; y algunos tipos de "
-"letra e iconos puede que no se muestren correctamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Más seguro"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"A éste nivel, medios de video y audio HTML5 se transforman en cliquear-para-"
-"reproducir vía NoScript; todas las optimizaciones de rendimiento de "
-"JavaScript son deshabilitadas; algunas ecuaciones matemáticas pueden no "
-"mostrarse apropiadamente; algunas características de presentación de tipo de"
-" letras son deshabilitadas; algunos tipos de imágenes están deshabilitados; "
-"y JavaScript está deshabilitado por defecto en todos los sitios no-<a href"
-"=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Estándar"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"En éste nivel, todas las caracteristicas del navegador están habilitadas. "
-"Esta es la opción más utilizable."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1791,32 +1660,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1827,7 +1693,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1932,12 +1798,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Remové el Navegador Tor de tu sistema borrando la carpeta que lo contiene "
-"(mirá la sección <a href='uninstalling'>Desinstalando</a> para más "
-"información)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2031,20 +1893,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Usuarios que requieren un alto grado de seguridad en su navegación web "
-"deberían ajustar la <a href=\"/security-slider\"> regla deslizante de "
-"seguridad</a> del Navegador Tor a \"Más-Seguro\" (que deshabilita JavaScript"
-" para sitios web no-HTTPS) o \"El-Más-Seguro\" (que lo hace para todos los "
-"sitios web). Sin embargo, deshabilitando JavaScript evitará que muchos "
-"sitios web sean mostrados correctamente, de manera que el ajuste por defecto"
-" del Navegador Tor es permitir a todos los sitios web correr código en "
-"JavaScript en el modo \"Estándar\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2165,12 +2019,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Si aún no podés conectarte, tu proveedor de servicio de Internet puede estar"
-" censurando conexiones a la red de Tor. Leé la sección <a "
-"href=\"/circumvention\">Evitando obstáculos</a> por posibles soluciones."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2181,14 +2032,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"El Navegador Tor está bajo desarrollo constante, y algunas dificultades son "
-"conocidas pero no están aún solucionadas. Por favor revisá la página <a href"
-"=\"/known-issues\">Dificultades conocidas</a> para ver si el problema que "
-"estás experimentando está ya listado ahí."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2288,11 +2134,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Específicamente, BitTorrent <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">no es anónimo sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2306,46 +2150,118 @@ msgstr "Cómo remover el Navegador Tor de tu sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Remover el Navegador Tor de tu sistema es simple:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"El Navegador Tor no afecta ninguno de los programas o ajustes existentes en "
-"tu computadora. Desinstalando el Navegador Tor no afectará los programas o "
-"ajustes en tu computadora."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Remover el Navegador Tor de tu sistema es simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Borrá la carpeta del Navegador Tor o la aplicación."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Vaciá la basura."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Borrá la carpeta del Navegador Tor."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Vaciá la basura"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Fijate que no se usará la utilidad estándar para \"Desinstalar\" de tu "
-"sistema operativo."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+es.po b/contents+es.po
index 86968c4af..564467f53 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,17 +1,17 @@
 # Translators:
-# Zuhualime Akoochimoya, 2019
 # Antonela D <antonela at torproject.org>, 2019
-# erinm, 2019
 # sim, 2019
+# erinm, 2019
 # Emma Peel, 2019
+# Zuhualime Akoochimoya, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -194,13 +194,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"De forma predeterminada, el Tor Browser no conserva ningún historial de "
-"navegación. Las cookies sólo son válidas durante una sola sesión (hasta que "
-"se cierre el Tor Browser o se solicite una <a href=\"/es/managing-identities"
-"/#nueva-identidad\">Nueva Identidad</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -426,16 +422,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"En la mayoría de los casos escoger \"Conectar\" te permitirá conectar a la "
-"red Tor sin ninguna configuración adicional. Una vez hagas clic aparecerá "
-"una barra de estado mostrando el progreso de la conexión de Tor. Si tienes "
-"una conexión relativamente rápida pero la barra parece haberse quedado fija "
-"en un determinado punto, lee la página <a href=\"/troubleshooting\">Solución"
-" de problemas</a> para obtener ayuda para solucionar el problema."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -467,15 +456,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"La primera pantalla, pregunta si el acceso a la red Tor está bloqueado o "
-"censurado en tu conexión. Si no crees que este sea el caso, selecciona "
-"\"No\". Si sabes que tu conexión está censurada, o has intentado conectar a "
-"la red Tor y no han funcionado otras soluciones, selecciona \"Sí\",  que te "
-"llevará a la pantalla <a href=\"/circumvention\">Evasión</a> para configurar"
-" un transporte conectable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -519,19 +502,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"La mayoría de los <a href=\"/transports\">Transportes Conectables</a>, como "
-"obfs3 y obfs4, se basan en el uso de repetidores \"puente\". Igual que los "
-"repetidores Tor ordinarios, los puentes de red son ejecutados por "
-"voluntarios, pero no son públicos, así que no se pueden identificar "
-"fácilmente. Usar puentes en combinación con transportes conectables ayuda a "
-"camuflar el uso de Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -701,8 +677,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -712,14 +688,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 hace que el tráfico de Tor parezca aleatorio, así no se parece a Tor "
-"ni a ningún otro protocolo. Si bien todavía está incluido por defecto, se "
-"recomienda usar obfs4 en su lugar, ya que tiene varias mejoras de seguridad "
-"con respecto a obfs3."
+"obfs4 hace que el tráfico de Tor tenga apariencia aleatoria, como obfs3, y "
+"además evita que los censores encuentren puentes de red mediante el "
+"escaneado de Internet. Los puentes de red obfs4 son más difíciles de "
+"bloquear que los puentes obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -733,23 +709,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 hace que el tráfico de Tor tenga apariencia aleatoria, como obfs3, y "
-"además evita que los censores encuentren puentes de red mediante el "
-"escaneado de Internet. Los puentes de red obfs4 son más difíciles de "
-"bloquear que los puentes obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -879,16 +838,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"El acceso directo a la red Tor a veces puede estar bloqueado por tu "
-"Proveedor de Servicios de Internet (ISP) o por un gobierno. El Navegador Tor"
-" incluye algunas herramientas de evasión para evitar estos bloqueos. Estas "
-"herramientas se llaman \"transportes conectables\". Lee la página <a href"
-"=\"/en-US/transports\">Transportes Conectables</a> para más información "
-"sobre los tipos de transporte que están disponibles actualmente."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -948,36 +900,24 @@ msgstr "##### ¿QUÉ TRANSPORTE DEBERÍA USAR?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Cada uno de los transportes listados en el menú del Tor Launcher funciona de"
-" una forma diferente (para más detalles, lee la página <a "
-"href=\"/es/transports\">Transportes conectables</a>), y la efectividad de "
-"cada uno depende de tu situación."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Si, por primera vez, estás intentando eludir una conexión bloqueada, has de "
-"intentar los los diferentes transportes: obfs3, obfs4, fte y meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Si pruebas todas estas opciones y no consigues conectar con ninguna de "
-"ellas, necesitarás introducir direcciones de puentes de red manualmente. Lee"
-" la sección <a href=\"/en-US/bridges/\">Puentes</a> para saber qué son los "
-"repetidores puente y cómo obtenerlos."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1076,19 +1016,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"En el circuito, el nodo de entrada o Guarda es el primer nodo, y es "
-"aleatoria y automáticamente seleccionado por Tor. Pero es diferente de los "
-"otros nodos en el circuito. A los efectos de evitar ataques por perfilación,"
-" el nodo Guarda cambia solamente cada 2-3 meses, a diferencia de los otros "
-"nodos, que cambian con cada nuevo dominio. Para más información acerca de "
-"Guardas, consulta las <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">Preguntas Más "
-"Frecuentes</a> y el <a "
-"href=\"https://support.torproject.org/es/tbb/tbb-2/\">Portal de Soporte</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1137,11 +1068,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Mira la página <a href=\"/es/secure-connections\">Conexiones seguras</a> "
-"en busca de información sobre cómo asegurar tu conexión al iniciar sesión."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1212,22 +1141,14 @@ msgstr "##### NUEVO CIRCUITO TOR PARA ESTE SITIO."
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Esta opción es útil si el <a href=\"/es/about/#how-tor-works\">repetidor de "
-"salida</a> que estás usando no puede conectar al sitio web que solicitas, o "
-"no está cargando adecuadamente. Seleccionarla provocará que la pestaña "
-"actualmente activa se recargue sobre un nuevo circuito de Tor. Otras "
-"pestañas y ventanas abiertas para el mismo sitio web también usarán el nuevo"
-" circuito una vez sean recargadas. Esta opción no borra ninguna información "
-"privada ni desvincula tu actividad, y tampoco afecta a tus conexiones "
-"actuales a otros sitios web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1281,12 +1202,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Todo el tráfico entre los usuarios de Tor y los servicios cebolla está "
-"cifrado de extremo-a-extremo, por lo que no hace falta preocuparse de <a "
-"href=\"/es/secure-connections\">conectar a través de HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1364,12 +1282,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"También puedes asegurarte de poder acceder a otros servicios cebolla "
-"conectando al <a href=\"http://3g2upl4pq6kufc4m.onion\">servicio cebolla de "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1463,19 +1377,11 @@ msgstr "##### DATOS POTENCIALMENTE VISIBLES"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1486,19 +1392,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1509,10 +1407,6 @@ msgstr "El sitio que estás visitando."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1562,10 +1456,6 @@ msgstr "Si se está usando Tor o no."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1639,68 +1529,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "El más seguro de todos"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"En este nivel, los audiovisuales HTML5 funcionan en modo clic-para-"
-"reproducir mediante NoScript; se deshabilitan todas las optimizaciones de "
-"rendimiento de JavaScript; algunas ecuaciones matemáticas puede que no se "
-"muestren adecuadamente; algunas características de renderización de fuentes "
-"están deshabilitadas; algunos tipos de imagen están deshabilitados; "
-"JavaScript está deshabilitado por defecto en todos los sitios; la mayoría de"
-" formatos de vídeo y audio están deshabilitados; y algunas fuentes e iconos "
-"puede que no se muestren correctamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Más segura"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"En este nivel, el vídeo y el audio HTML5 se comportan en modo clic-para-"
-"reproducir mediante NoScript; se deshabilitan todas las optimizaciones de "
-"rendimiento; algunas ecuaciones matemáticas puede que no se muestren "
-"adecuadamente; algunas características de renderización están "
-"deshabilitadas; algunos tipos de imagen están deshabilitados; y JavaScript "
-"está deshabilitado por defecto en todos los sitios no-<a href=\"/es/secure-"
-"connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Estándar"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"En este nivel, todas las características del navegador están habilitadas. "
-"Esta es la opción más fácil de usar."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1813,41 +1685,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"En este nivel están habilitadas todas las funcionalidades del navegador ."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Este nivel deshabilita características del sitio web que son a menudo "
-"peligrosas."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Esta opción puede hacer que algunos sitios pierdan funcionalidad."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript está deshabilitado en todos los sitios no-<a href=\"/secure-"
-"connections\">HTTPS</a>; algunas fuentes y símbolos matemáticos están "
-"deshabilitados; audio y vídeo (medios HTML5) son hacer-clic-para-reproducir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Este nivel permite sólo las características de sitio web requeridas para "
-"sitios estáticos y servicios básicos."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1857,13 +1718,10 @@ msgstr " Estos cambios afectan a imágenes, medios, y scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript está deshabilitado por defecto en todos los sitios; algunas "
-"fuentes, íconos, símbolos matemáticos, e imágenes están deshabilitados; "
-"audio y vídeo (medios HTML5) son hacer-clic-para-reproducir."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1964,11 +1822,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Elimina Tor de tu sistema borrando la carpeta que lo contiene (lee la "
-"sección <a href='uninstalling'>Desinstalar</a> para más información)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2064,20 +1919,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Los usuarios que requieran un alto grado de seguridad en su navegación deben"
-" de configurar la <a href=\"/security-slider\">Seguridad </a> a “Segura” en "
-"el Navegador Tor (que deshabilita JavaScript para sitios web no HTTPS) o "
-"\"Más segura\" (que lo hace para todos los sitios web). Sin embargo, la "
-"desactivación de JavaScript evitará que muchos sitios web se muestren "
-"correctamente, por lo que la configuración predeterminada del Navegador Tor "
-"es permitir que todos los sitios web ejecuten scripts en el modo "
-"\"Estándar\""
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2200,12 +2047,9 @@ msgstr "##### ¿ESTÁ CENSURADA TU CONEXIÓN?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Si aún no puedes conectar, tu Proveedor de Servicios de Internet (ISP) "
-"podría estar censurando las conexiones a la red Tor. Lee la sección <a "
-"href=\"circumvention\">Elusión</a> en busca de posibles soluciones."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2216,14 +2060,9 @@ msgstr "##### PROBLEMAS CONOCIDOS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"El Navegador Tor está bajo desarrollo constante, y algunos problemas son "
-"conocidos pero aún no están reparados. Por favor, revisa la página de <a "
-"href=\"/es/known-issues\">Problemas conocidos</a> para ver si el problema "
-"que estás experimentando ya está listado allí."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2323,11 +2162,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Específicamente BitTorrent <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">​no es anónimo sobre Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2341,50 +2178,120 @@ msgstr "Cómo eliminar a Tor de tu sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Eliminar el Navegador Tor de tu sistema es simple:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor no afecta a ningún software existente en tu máquina ni a los ajustes de "
-"este. Desinstalar Tor no afectará ni al software de tu sistema ni a sus "
-"configuraciones."
+"* Localiza tu carpeta o aplicación del Navegador Tor. La ubicación habitual "
+"es en el Escritorio."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Eliminar el Navegador Tor de tu sistema es simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Elimina la carpeta o aplicación del Navegador Tor."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Vacía tu Papelera."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr "En macOS:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
-"1. Encuentra la carpeta de Tor. El lugar predeterminada en Windows es el "
-"Escritorio; en macOS es la carpeta de Aplicaciones. En Linux, no hay una "
-"ubicación predeterminada, sin embargo, la carpeta será nombrada \"tor-"
-"browser_en-US\" si estás ejecutando Tor en inglés."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Borra la carpeta del Navegador Tor."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Vacía tu Papelera"
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr "En Linux:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Toma en cuenta que no se usa la utilidad \"Desinstalar\" estándar de tu "
-"sistema operativo."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+fa.po b/contents+fa.po
index db9b1cf72..f7906d92a 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: MYZJ, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
@@ -198,12 +198,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"به صورت پیش فرض، مرورگر تور هیچ سابقه مروری را نگهداری نمی کند. کوکی‌ها تنها"
-" برای یک نشست(تا زمانی که از مرورگر تور خارج شوید یا یک <a href=\"/managing-"
-"identities/#new-identity\">هویت جدید</a> درخواست کنید) معتبر هستند."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -426,16 +423,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"در بیشتر موارد, انتخاب \"وصل شدن\" به شما اجازه خواهد داد که بدون هیچ پیکر "
-"بندی ای به شبکه تور وصل شوید. یک بار کلیک کنید, یک قسمت اطلاعات پدیدار می "
-"شود که نشان دهنده پیش رفتن برای وصل شدن به تور است.  اگر شما یک اتصال نسبتا "
-"سریع دارید, اما این اطلاعات بنظر میرسد که در یک نقطه ایستاده, برای حل این "
-"مشکل لینک زیر را مشاهده کنید<a "
-"href=\"/troubleshooting\">Troubleshooting</a>."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -466,15 +456,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"نخستین صفحه، درباره مسدود یا سانسور بودن شبکه تور بر روی ارتباط اینترنتی شما"
-" می پرسد. اگر شما مطمئن هستید که اینگونه نیست، \"خیر\" را انتخاب کنید. اما "
-"اگر می دانید که ارتباط اینترنتی شما، سانسور شده است یا اگر با هیچ روشی نمی "
-"توانید به شبکه تور متصل شوید، \"بله\" را انتخاب کنید، در نتیجه شما به صفحه "
-"مربوط به <a href=\"/circumvention\">دور زدن سانسور</a> هدایت خواهید شد تا یک"
-" Pluggable Transport را پیکربندی کنید."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -518,20 +502,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"بیشتر <a href=\"/transports\">Pluggable Transport ها</a> مانند obfs3 و "
-"obfs4، با استفاده از ایستگاه های پلِ قابل اعتماد، کار می کنند. مانند ایستگاه"
-" های معمولی تور، پل ها نیز توسط افراد داوطلب اجرا می شوند؛ اما برخلاف "
-"ایستگاه های معمولی، ایستگاه های پل، به صورت عمومی منتشر نمی شوند. بنابراین "
-"دشمنان شبکه تور نمی توانند آن ها را به آسانی شناسایی کنند. استفاده از پل ها "
-"به همراه Pluggable Transport ها موجب می شود تا کسی متوجه استفاده شما از تور "
-"نشود."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -701,8 +677,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -712,14 +688,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 موجب می شود تا ترافیک تور به صورت تصادفی در آید، درنتیجه ترافیک به هیچ"
-" عنوان مشابه ترافیک شبکه تور یا هر پروتکل دیگری نخواهد بود و غیرقابل شناسایی"
-" می شود. با این حال، پیشنهاد می کنیم به جای obfs3 از obfs4 استفاده کنید. "
-"زیرا این نسخه، دارای چندین بهبود امنیتی نسبت به obfs3 می باشد."
+"obfs4 نیز مانند obfs3 موجب می شود تا ترافیک تور به صورت تصادفی درآید، هم "
+"چنین علاوه بر آن، باعث می شود تا مراجع سانسور کننده نتوانند با اسکن اینترنت،"
+" ایستگاه های پل را شناسایی و مسدود کنند. پل هایی که از نوع obfs4 هستند، کمتر"
+" از پل های obfs3 مسدود می شوند."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -733,23 +709,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 نیز مانند obfs3 موجب می شود تا ترافیک تور به صورت تصادفی درآید، هم "
-"چنین علاوه بر آن، باعث می شود تا مراجع سانسور کننده نتوانند با اسکن اینترنت،"
-" ایستگاه های پل را شناسایی و مسدود کنند. پل هایی که از نوع obfs4 هستند، کمتر"
-" از پل های obfs3 مسدود می شوند."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -881,15 +840,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"گاهی دسترسی مستقیم به شبکه تور، توسط شرکت فراهم کننده اینترنت - ISP - یا "
-"سایر نهادهای دولتی، مسدود می شود و نمی توان به شبکه وصل شد. مرورگر تور برای "
-"برطرف کردن این مسدودیت ها، ابزارهایی را برای دور زدن سانسور در نظر گرفته است"
-" که با نام Pluggable Transport شناخته می شوند. برای آگاهی بیشتر در این باره،"
-" صفحه <a href=\"/en-US/transports\">Pluggable Transport</a> را ببینید."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -950,36 +903,24 @@ msgstr "##### باید از کدام ترنسپورت استفاده کنم؟"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"هر کدام از انواع Pluggable Transport هایی که در پنجره راه انداز تور لیست شده"
-" اند، با روش های متفاوتی نسبت به یکدیگر کار می کنند(برای آگاهی از جزییات "
-"بیشتر،  صفحه <a href=\"/en-US/transports\">Pluggable Transport</a> را "
-"ببینید)."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"اگر برای نخستین بار است که می خواهید یک ارتباط سانسور شده را دور بزنید، نیاز"
-" است تا یک از انواع obfs3 یا obfs4 یا fte و یا meek-azure را آزمایش کنید."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"اگر شما با هیچ کدام از این موارد نتوانستید به اینترنت متصل شوید، نیاز است تا"
-" به صورت دستی، آدرس یک ایستگاه پل را وارد کنید. برای آشنایی با پل ها و اینکه"
-" چگونه باید آن ها را بدست آورید، بخش <a href=\"/en-US/bridges/\">پل ها</a> "
-"را بخوانید."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1081,12 +1022,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
-"در داخل یک چرخه تور، گره نگهبان یا گره ورودی، همیشه به عنوان نخستین گره در چرخه می باشد و به صورت تصادفی و خودکار توسط تور انتخاب می شود و نسبت به سایر گره های داخل چرخه، متفاوت است. به منظور پیشگیری از حملات پروفایل که نوعی حمله مخرب از سوی مهاجم می باشند، بر خلاف سایر گره ها که هر بار که به دامنه اینترنتی جدیدی وصل می شوید، آدرس آن ها تغییر می کند، گره نگهبان فقط پس از 2-3 ماه تغییر خواهد کرد.\n"
-"برای آگاهی بیشتردرباره گره‌های نگهبان، به <a href=\"https://www.torproject.org/docs/faq#EntryGuards\">پرسش های پرتکرار کاربران</a> و <a href=\"https://support.torproject.org/tbb/tbb-2/\">پرتال پشتیبانی</a> سر بزنید. "
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1129,11 +1068,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* برای اطلاعات مهم در خصوص این که چگونه ارتباط خود را هنگام ورود امن کنید، "
-"به صفحه‌ی <a href=\"/secure-connections\">ارتباطات امن</a> مراجعه کنید."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1203,22 +1140,14 @@ msgstr "###### چرخه جدید تور برای این سایت"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"این گزینه برای زمانی مفید خواهد بود که <a href=\"/about/#how-tor-works\">گره"
-" پایانی</a> نتواند شما را به وب سایت موردنظرتان وصل کند و یا وب سایت، به "
-"درستی بارگیری و نمایش داده نشود. با انتخاب این گزینه، سربرگ یا پنجره فعلی "
-"مرورگر تور بر روی چرخه جدید، از نو بارگیری خواهد شد. سایر سربرگ ها یا پنجره "
-"های مربوط \"به همان وب سایت\" نیز دوباره بارگیری شده و بر روی چرخه جدید قرار"
-" می گیرند. این گزینه، هیچ کدام از اطلاعات خصوصی شما را پاک نمی کند، پیوند "
-"بین فعالیت های وبگردی را از بین نمی برد و بر روی ارتباط شما به دیگر وب سایت "
-"ها، هیچ تاثیری نخواهد داشت."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1272,12 +1201,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* تمام ترافیک بین کاربران تور و سرویس های پیازی بر اساس رمزگذاری انتها به "
-"انتها انجام می شود و بنابراین، نیازی به نگرانی در مورد <a href=\"/secure-"
-"connections\">ارتباط بر روی HTTPS</a> نمی باشد."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1348,12 +1274,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"برای اطمینان از اینکه شما می توانید به سایر سرویس های پیازی نیز دسترسی داشته"
-" باشید، به <a href=\"http://3g2upl4pq6kufc4m.onion/\">سرویس پیازی "
-"DuckDuckGo</a> که یک موتور جستجوی ایمن می باشد، بروید."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1455,19 +1377,11 @@ msgstr "##### قابلیت مشاهده داده ها"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1478,19 +1392,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1501,10 +1407,6 @@ msgstr "این سایت در حال بازدید شدن است."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1552,10 +1454,6 @@ msgstr "هرچه یا تور درحال استفاده نیست."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1628,68 +1526,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "ایمن ترین"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"در این سطح، برای اجرای ویدیوهای HTML5 و رسانه های صوتی، باید با استفاده از "
-"افزونه NoScript که به صورت پیش فرض در مرورگر تور نصب شده است، آن ها را به "
-"صورت دستی اجرا کرد؛ همه بهینه سازی های عملکردهای جاوا اسکریپت غیرفعال شده "
-"اند؛ ممکن است برخی از معادلات ریاضی به درستی نمایش داده نشوند؛ برخی از ویژگی"
-" های شناسایی و نمایش فونت نیز غیرفعال شده اند؛ بعضی از انواع تصاویر غیرفعال "
-"شده اند؛ به صورت پیش فرض، جاوا اسکریپت در همه سایت ها غیرفعال شده است؛ بیشتر"
-" فرمت های ویدیویی و صوتی نیز غیرفعال شده اند؛ و ممکن است برخی فونت ها و "
-"آیکون ها به درستی نمایش داده نشوند."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "ایمن تر"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"در این سطح، برای اجرای ویدیوهای HTML5 و رسانه های صوتی، باید با استفاده از "
-"افزونه NoScript که به صورت پیش فرض در مرورگر تور نصب شده است، آن ها را به "
-"صورت دستی اجرا کرد؛ همه بهینه سازی های عملکردهای جاوا اسکریپت غیرفعال شده "
-"اند؛ ممکن است برخی از معادلات ریاضی به درستی نمایش داده نشوند؛ برخی از ویژگی"
-" های شناسایی و نمایش فونت نیز غیرفعال شده اند؛ بعضی از انواع تصاویر غیرفعال "
-"شده اند؛ و به صورت پیش فرض، جاوا اسکریپت در همه سایت هایی که از پروتکل <a "
-"href=\"/secure-connections\">HTTPS</a> استفاده نمی کنند، غیرفعال شده است."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "استاندارد"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"در این مرحله همه ی قابلیت های مرورگر فعال شدند.\n"
-"این پر استفاده ترین گزینه است."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1803,41 +1683,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "در این سطح، تمام ویژگی های مرورگر تور و وب سایت ها، فعال می باشند."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"این سطح امنیتی، تمام ویژگی های یک وب سایت که معمولا خطرناک هستند را غیرفعال "
-"می کند."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "این کار ممکن است موجب شود تا عملکرد برخی از سایت ها دچار اختلال گردد."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"جاوا اسکریپت در تمام وب سایت هایی که از پروتکل <a href=\"/secure-"
-"connections\">HTTPS</a> استفاده نمی کنند، غیرفعال می باشد؛ برخی فونت ها و "
-"نشانه های ریاضی غیرفعال شده اند؛ و برای اجرای رسانه های ویدیویی و "
-"صوتی(HTML5) باید به صورت دستی آن ها را اجرا کنید."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"در این سطح، فقط ویژگی هایی از وب سایت فعال هستند که برای سایت های ایستا و "
-"سرویس های پایه موردنیاز می باشند."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1847,13 +1716,10 @@ msgstr "این تغییرات بر روی تصاویر، رسانه ها و اس
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"به صورت پیش فرض، جاوا اسکریپت در تمام سایت ها غیر فعال می باشد؛ برخی از "
-"آیکون ها، فونت ها، نشانه های ریاضی و تصاویر نیز غیر فعال هستند؛ و برای اجرای"
-" رسانه های ویدیویی و صوتی(HTML5) باید به صورت دستی آن ها را اجرا کنید."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1954,11 +1820,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"برای حذف مرورگر تور از سیستم خود، پوشه‌ی آن را حذف کنید (برای اطلاعات بیشتر "
-"بخش <a href='uninstalling'>حذف کردن</a> را ببینید)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2055,19 +1918,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"کاربرانی که نیازمند امنیت بالا در هنگام وبگردی هستند، می بایست سطح امنیتی "
-"مرورگر تور را بر روی \"ایمن تر\"(که جاوا اسکریپت را برای وب سایت هایی که از "
-"پروتکل HTTPS استفاده نمی کنند، غیرفعال خواهد کرد) و یا \"ایمن ترین\"(که جاوا"
-" اسکریپت را برای همه وب سایت ها غیرفعال خواهد کرد) تنظیم کنند. با این حال، "
-"غیرفعال شدن جاوا اسکریپت موجب می شود تا بسیاری از سایت ها به درستی نمایش "
-"داده نشوند، به همین دلیل، مرورگر تور به صورت پیش فرض اجازه اجرای جاوا "
-"اسکریپت در حالت \"استاندارد\" را می دهد."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2185,12 +2041,9 @@ msgstr "##### آیا ارتباط اینترنتی شما سانسور شده ا
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"اگر همچنان نمی توانید متصل شوید, احتمال دارد سرویس دهنده شبکه شما, اتصالات "
-"به شبکه تور را مسدود می کند. برای راه حل های امکان پذیر به این لینک بروید <a"
-" href=\"/circumvention\">Circumvention</a>."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2201,14 +2054,9 @@ msgstr "##### مشکلات احتمالی"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"مرورگر تور به صورت مداوم در حال توسعه می باشد و برخی از مشکلات آن شناسایی "
-"شده اند اما هنوز برطرف نشده اند. لطفاً صفحه <a href=\"/known-issues\">مشکلات"
-" شناخته شده</a> را بررسی کنید تا ببینید مشکلی که شما در حال تجربه  آن هستید،"
-" در آن جا وجود دارد یا نه."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2306,12 +2154,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"بیت تورنت، به طور خاص <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">نمی تواند بر روی تور، ناشناس "
-"باشد</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2325,50 +2170,118 @@ msgstr "چگونه مرورگر تور را از سیستم خود حذف کنی
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "حذف مرورگر تور از سیستم شما ساده است:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"مرورگر تور هیچ تاثیری بر روی نرم افزارها یا تنظیمات موجود بر روی کامپیوتر "
-"شما ندارد. حذف مرورگر تور نیز هیچ گونه تاثیری بر آن ها نخواهد گذاشت."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "حذف مرورگر تور از سیستم شما ساده است:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. به محل نصب مرورگر تور بروید. در سیستم عامل ویندوز، محل نصب به صورت پیش "
-"فرض بر روی \"دسکتاپ\" می باشد؛ در سیستم عامل macOS، محل نصب پیش فرض در پوشه "
-"\"Applications\" می باشد؛ در سیستم عامل لینوکس، هیچ محل پیش فرضی تعیین نشده "
-"است، با این حال، اگر شما نسخه انگلیسی مرورگر تور را اجرا کنید، در پوشه ای به"
-" نام \"tor-browser_en-US\" قرار خواهد گرفت."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. حذف پوشه مرورگر تور"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. خالی کردن زباله های خود"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"نکته:توجه داشته باشید که خدمت استاندارد حذف نصب نرم افزار سیستم عامل شما "
-"استفاده نمی شود."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+fr.po b/contents+fr.po
index c36a7ee27..aff8b39af 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1,16 +1,16 @@
 # Translators:
 # Emma Peel, 2018
+# Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
 # AO <ao at localizationlab.org>, 2019
 # erinm, 2019
-# Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Curtis Baltimore <curtisbaltimore at protonmail.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -194,13 +194,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Par défaut, le Navigateur Tor ne conserve aucun historique de navigation. "
-"Les témoins ne sont valides que pour une seule session (jusqu’à la fermeture"
-" du Navigateur Tor ou si une <a href=\"/fr/managing-identities/#new-"
-"identity\">nouvelle identité</a> est demandée)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -431,16 +427,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Dans la plupart des cas, « Se connecter » vous permettra de vous connecter "
-"au réseau Tor sans autre configuration. Une fois que vous aurez cliqué, une "
-"barre d’état apparaîtra et affichera l’avancement de la connexion de Tor. Si"
-" votre connexion est plutôt rapide, mais que la barre d’état semble bloquée "
-"à un certain niveau, la page <a href=\"/fr/troubleshooting\">Dépannage</a> "
-"vous aidera à régler le problème."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -472,16 +461,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Le premier écran demande si l’accès au réseau Tor est bloqué ou censuré sur "
-"votre connexion. Si vous ne pensez pas que c’est le cas, sélectionnez « Non "
-"». Si vous savez que votre connexion est censurée ou si vous avez tenté sans"
-" succès de vous connecter au réseau Tor et qu’aucune autre solution n’a "
-"fonctionné, sélectionnez « Oui ». L’écran <a "
-"href=\"/fr/circumvention\">Contournement</a> apparaîtra alors afin que vous "
-"configuriez un transport enfichable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -526,20 +508,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"La plupart des <a href=\"/fr/transports\">transports enfichables</a>, tels "
-"qu’obfs3 et obfs4, comptent sur l’utilisation de relais-ponts. Comme les "
-"relais Tor ordinaires, les ponts sont gérés par des bénévoles ; cependant, "
-"contrairement aux relais ordinaires, ils ne sont pas répertoriés "
-"publiquement et un adversaire ne peut donc pas les identifier facilement. "
-"L’utilisation de ponts combinés à des transports enfichables aide à déguiser"
-" le fait que vous utilisez Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -710,8 +684,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -721,14 +695,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 donne à Tor une apparence aléatoire, de sorte qu’il ne ressemble ni à "
-"Tor ni à aucun autre protocole. Bien qu’il soit encore inclus par défaut, il"
-" est plutôt recommandé d’utiliser obfs4, car il comporte plusieurs "
-"améliorations de sécurité par rapport à obfs3."
+"obfs4 donne à Tor une apparence aléatoire, comme obfs3, et empêche aussi les"
+" censeurs de trouver des ponts en balayant Internet. Les ponts obfs4 sont "
+"moins susceptibles d’être bloqués que les ponts obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -742,22 +715,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 donne à Tor une apparence aléatoire, comme obfs3, et empêche aussi les"
-" censeurs de trouver des ponts en balayant Internet. Les ponts obfs4 sont "
-"moins susceptibles d’être bloqués que les ponts obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -890,16 +847,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"L’accès direct au réseau Tor pourrait parfois être bloqué par votre "
-"fournisseur d’accès à internet ou par un gouvernement. Le Navigateur Tor "
-"comprend des outils de contournement de ces blocages. On appelle ces outils "
-"des « transports enfichables ». Plus de précisions sur les types de "
-"transports proposés actuellement se trouvent sur la page <a "
-"href=\"/fr/transports\">Transports enfichables</a>."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -960,37 +910,24 @@ msgstr "##### QUEL TRANSPORT DEVRAIS-JE UTILISER ?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Chacun des transports répertoriés dans le menu du Lanceur Tor fonctionne "
-"d’une façon différente (pour plus de précisions, consulter la page <a "
-"href=\"/fr/transports\">Les transports enfichables</a>) et leur efficacité "
-"dépend de vos circonstances particulières."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Si vous essayez de contourner pour la première fois une connexion bloquée, "
-"vous devriez essayer les différents transports : obfs3, obfs4, fte et meek-"
-"azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Si vous avez essayé toutes ces actions et qu’aucune ne vous permet de vous "
-"connecter, vous devrez saisir manuellement des adresses de pont. Lisez la "
-"section <a href=\"/fr/bridges\">Les ponts</a> pour découvrir ce que sont les"
-" ponts et comment en obtenir."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1091,20 +1028,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Dans le circuit, le nœud de garde ou d’entrée est le premier nœud. Il est "
-"automatiquement et aléatoirement sélectionné par Tor. Mais il est différent "
-"des autres nœuds du circuit. Afin d’éviter les attaques par profilage, le "
-"nœud de garde ne change qu’après 2 à 3 mois, contrairement aux autres nœuds "
-"qui changent pour chaque nouveau domaine. Pour plus de précisions sur les "
-"gardes, consultez la <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> (site en "
-"anglais) et le <a "
-"href=\"https://support.torproject.org/fr/tbb/tbb-2/\">Portail "
-"d’assistance</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1154,12 +1081,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Consultez la page <a href=\"/fr/secure-connections\">Connexions "
-"sécurisées</a> pour obtenir des renseignements importants sur la façon de "
-"sécuriser votre connexion lors d’une authentification."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1230,22 +1154,14 @@ msgstr "###### NOUVEAU CIRCUIT TOR POUR CE SITE"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Cette option est utile si le <a href=\"/fr/about/#how-tor-works\">relais de "
-"sortie</a> que vous utilisez n’arrive pas à se connecter au site Web dont "
-"vous avez besoin ou ne le charge pas correctement. En la sélectionnant, la "
-"fenêtre ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les "
-"autres fenêtres et onglets ouverts du même site Web utiliseront aussi le "
-"nouveau circuit quand ils seront rechargés. Cette option n’efface aucun "
-"renseignement personnel, ni ne dissocie votre activité, ni n’affectera vos "
-"connexions actuelles à d’autres sites Web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1298,12 +1214,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tout le trafic entre les utilisateurs de Tor et les services onion est "
-"chiffré de bout en bout, vous n’avez donc pas à vous soucier de vous <a "
-"href=\"/fr/secure-connections\">connecter par HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1382,12 +1295,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Vous pouvez aussi vérifier si vous arrivez à accéder à d’autres services "
-"onion en vous connectant au <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\">service onion de DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1483,19 +1392,11 @@ msgstr "##### DONNÉES POTENTIELLEMENT VISIBLES"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1506,19 +1407,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1529,10 +1422,6 @@ msgstr "Le site que vous visitez."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1583,10 +1472,6 @@ msgstr "Si Tor est utilisé ou non."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1660,67 +1545,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Le plus sûr"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"À ce niveau, les contenus multimédias HTML5 deviennent « cliquer pour lire »"
-" avec NoScript ; toutes les optimisations des performances JavaScript sont "
-"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher"
-" correctement ; certaines fonctions de rendu des polices sont désactivées ; "
-"certains types d’images sont désactivés ; JavaScript est désactivé par "
-"défaut pour tous les sites ; la plupart des formats vidéo et audio sont "
-"désactivés ; et certaines polices et icônes pourraient ne pas s’afficher "
-"correctement."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Plus sûr"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"À ce niveau, les contenus multimédias HTML5 deviennent « cliquer pour lire »"
-" avec NoScript ; toutes les optimisations des performances JavaScript sont "
-"désactivées ; certaines équations mathématiques pourraient ne pas s’afficher"
-" correctement ; certaines fonctions de rendu des polices sont désactivées ; "
-"certains types d’images sont désactivés ; et JavaScript est désactivé par "
-"défaut pour tous les sites <a href=\"/fr/secure-connections\">non HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Normal"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"À ce niveau, toutes les fonctions du navigateur sont activées. C’est "
-"l’option la plus pratique."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1834,42 +1702,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"À ce niveau, toutes les fonctions du Navigateur Tor et des sites Web sont "
-"activées."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Ce niveau désactive les fonctions de sites Web qui sont souvent dangereuses."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Cela peut entraîner la perte de fonctionnalité de certains sites."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript est désactivé sur tous les sites non <a href=\"/fr/secure-"
-"connections\">HTTPS</a> ; certaines polices et certains symboles "
-"mathématiques sont désactivés ; le son et la vidéo (médias HTML5) sont « "
-"cliquer pour lire »."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Ce niveau n’autorise que les fonctions de sites Web exigées pour les sites "
-"statiques et les services de base."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1879,13 +1735,10 @@ msgstr "Ces changements affectent les images, les médias et les scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript est désactivé sur tous les sites non HTTPS ; certaines polices et"
-" certains symboles mathématiques sont désactivés ; le son et la vidéo "
-"(médias HTML5) sont « cliquer pour lire »."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1988,12 +1841,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Retirez le Navigateur Tor de votre système en supprimant le dossier qui le "
-"contient (consultez le paragraphe <a "
-"href=’/fr/uninstalling’>Désinstallation</a> pour plus de précisions)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2091,20 +1940,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Les utilisateurs qui exigent un niveau de sécurité élevé quand ils "
-"parcourent le Web devraient régler le<a href=\"/security-slider\"> curseur "
-"de sécurité</a> du Navigateur Tor à « Plus sûr » (ce qui désactive le "
-"JavaScript pour les sites Web sans HTTPS) ou « Le plus sûr » (ce qui le fait"
-" pour tous les sites Web). Cependant, la désactivation du JavaScript "
-"empêchera de nombreux sites Web de s’afficher correctement, et c’est "
-"pourquoi le paramètre par défaut du Navigateur Tor permet à tous les sites "
-"Web d’exécuter des scripts en mode « Normal »."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2226,13 +2067,9 @@ msgstr "##### VOTRE CONNEXION EST-ELLE CENSURÉE ?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Si vous ne pouvez toujours pas vous connecter, il est possible que votre "
-"fournisseur d’accès à Internet censure les connexions vers le réseau Tor. "
-"Lire la section <a href=\"/fr/circumvention\">Contournement</a> pour "
-"découvrir des solutions possibles."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2243,14 +2080,9 @@ msgstr "##### PROBLÈMES CONNUS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Le Navigateur Tor évolue constamment et certains problèmes sont connus, mais"
-" n’ont pas encore été corrigés. Veuillez vous référer à la page <a "
-"href=\"/fr/known-issues\">Problèmes connus</a> pour vérifier si le problème "
-"que vous rencontrez  n’y est pas déjà répertorié."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2349,12 +2181,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent, en particulier, <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">n’est pas anonyme avec Tor</a></mark> "
-"(page en anglais)."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2368,50 +2197,118 @@ msgstr "Supprimer le Navigateur Tor de votre système"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Il est simple de supprimer le Navigateur Tor de votre système :"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Le Navigateur Tor n’affecte aucun logiciel existant ou paramètre de votre "
-"ordinateur. La désinstallation du Navigateur Tor n’affectera ni les "
-"logiciels ni les paramètres de votre système."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Il est simple de supprimer le Navigateur Tor de votre système :"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Supprimez le dossier ou l’application du Navigateur Tor."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Videz votre corbeille."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
-"1. Repérez le dossier de votre Navigateur Tor. L’emplacement par défaut est "
-"le bureau sous Windows et le dossier Applications sous macOS. Sous Linux, il"
-" n’y a pas d’emplacement par défaut, cependant le dossier sera nommé « tor-"
-"browser_fr » si vous utilisez la version en français du Navigateur Tor."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Supprimez le dossier du Navigateur Tor."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Videz votre corbeille."
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Notez que l’utilitaire habituel de désinstallation de votre système "
-"d’exploitation n’est pas utilisé."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ga.po b/contents+ga.po
index fb4e9d14c..3a1089e37 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -1,15 +1,15 @@
 # Translators:
 # Kevin Scannell <kscanne at gmail.com>, 2019
-# erinm, 2019
 # Emma Peel, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -192,13 +192,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"De réir réamhshocraithe, ní choinníonn Brabhsálaí Tor aon stair bhrabhsála. "
-"Bíonn fianáin bailí ar feadh seisiúin amháin (go dtí go scoirfidh tú de Tor,"
-" nó go dtí go n-iarrfaidh tú <a href=\"/managing-identities/#new-"
-"identity\">Aitheantas Nua</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -412,15 +408,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"De ghnáth, bíonn tú ceangailte le líonra Tor tar éis duit \"Ceangail\" a "
-"chliceáil, gan chumraíocht sa bhreis a dhéanamh. Ansin, feicfidh tú barra "
-"stádais a thaispeánann dul chun cinn an cheangail. Má théann an barra seo in"
-" abar agus ceangal Idirlín measartha maith agat, féach ar an leathanach <a "
-"href=\"/troubleshooting\">Fabhtcheartú</a> chun cúnamh a fháil."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -452,16 +442,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Fiafraítear díot ar an chéad scáileán an bhfuil cosc ar líonra Tor nó an "
-"bhfuil sé faoi chinsireacht ar do cheangal. Mura gcreideann tú go bhfuil, "
-"roghnaigh “Níl”. Má tá a fhios agat go bhfuil do cheangal faoi chinsireacht,"
-" nó má theip ort ceangal a bhunú le líonra Tor gan aon réiteach ar an "
-"bhfadhb, roghnaigh “Tá”. Sa chás sin, osclófar an scáileán <a "
-"href=\"/circumvention\">Timpeallú</a>, áit ar féidir leat córas iompair "
-"ionphlugáilte a shocrú."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -506,20 +489,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Úsáideann an chuid is mó de na <a href=\"/transports\">Córais Iompair "
-"Ionphlugáilte</a>, mar shampla obfs3 agus obfs4, athsheachadáin "
-"\"droichid\". Cosúil le gnáth-athsheachadáin Tor, is iad saorálaithe atá i "
-"gceannas ar na droichid seo; ach, murab ionann is gnáth-athsheachadán, ní "
-"fhoilsítear go poiblí iad, sa chaoi nárbh fhéidir le namhaid iad a aithint "
-"go héasca. Nuair a úsáideann tú droichead in éineacht le córas iompair "
-"inphlugáilte, níl sé soiléir go bhfuil tú ag úsáid Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -690,8 +665,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -701,14 +676,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"Cuireann obfs3 cuma randamach ar thrácht Tor, sa dóigh nach mbeadh cosúlacht"
-" aige le gnáth-thrácht Tor ná le haon phrótacal eile. Cé go bhfuil obfs3 ar "
-"fáil fós de réir réamhshocraithe, molaimid duit obfs4 a úsáid ina áit, toisc"
-" go bhfuil sé níos fearr ná obfs3 ó thaobh slándála."
+"Cuireann obfs4 cuma randamach ar thrácht Tor go díreach cosúil le obfs3, "
+"agus cuireann sé cosc ar chinsirí droichid a aimsiú trí scanadh an Idirlín. "
+"Níos lú an seans go gcuirtear cosc ar dhroichead obfs4 ná ar dhroichead "
+"obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -722,23 +697,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"Cuireann obfs4 cuma randamach ar thrácht Tor go díreach cosúil le obfs3, "
-"agus cuireann sé cosc ar chinsirí droichid a aimsiú trí scanadh an Idirlín. "
-"Níos lú an seans go gcuirtear cosc ar dhroichead obfs4 ná ar dhroichead "
-"obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -853,16 +811,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Uaireanta ní féidir leat rochtain dhíreach a fháil ar líonra Tor, mar gheall"
-" ar bhac a chuir do Sholáthraí Seirbhíse Idirlín nó rialtas romhat. Cuireann"
-" Brabhsálaí Tor roinnt uirlisí ar fáil a chabhraíonn leat na baic seo a "
-"sheachaint, darb ainm \"córais iompair ionphlugáilte\". Féach ar <a href"
-"=\"/en-US/transports\">an leathanach seo</a> chun tuilleadh eolais a fháil "
-"faoi na córais iompair atá ar fáil faoi láthair."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -912,34 +863,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Feidhmíonn gach ceann de na córais iompair i dTosaitheoir Tor ar bhealach "
-"difriúil (féach an leathanach <a href=\"/en-US/transports\">Córais Iompair "
-"Ionphlugáilte</a> chun tuilleadh eolais a fháil), agus braitheann a "
-"n-éifeachtacht ar na cúinsí speisialta a bhaineann leatsa féin."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Má bhain tú triail as na roghanna seo go léir agus ní féidir leat dul ar "
-"líne fós, ní mór duit seoltaí droichid a chur isteach de láimh. Léigh an "
-"rannóg maidir le <a href=\"/en-US/bridges/\">Droichid</a> le foghlaim cad is"
-" droichead ann agus conas is féidir iad a fháil."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1036,19 +977,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Is é an Garda nó an nód iontrála an chéad athsheachadán sa chiorcad. "
-"Roghnaíonn Tor go huathoibríoch agus go randamach é. Ach ní ionann é agus na"
-" hathsheachadáin eile sa chiorcad. Mar chosaint ar ionsaí aitheanta "
-"próifílithe, fanfaidh sé mar an chéad nód i do chiorcad ar feadh 2-3 mhí, i "
-"gcomparáid leis na hathsheachadáin eile a athraíonn gach uair a dtugann tú "
-"cuairt ar shuíomh nua. Chun tuilleadh eolais maidir le Gardaí a fháil, féach"
-" na <a href=\"https://www.torproject.org/docs/faq#EntryGuards\">Ceisteanna "
-"Coitianta</a> agus an <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Suíomh Tacaíochta</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1097,12 +1029,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Féach ar an leathanach <a href=\"/secure-connections\">Ceangail Shlána</a>"
-" chun eolas tábhachtach a fháil maidir le conas is féidir do cheangal a "
-"dhaingniú nuair a logálann tú isteach."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1172,22 +1101,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Tá an rogha seo úsáideach mura bhfuil <a href=\"/about/#how-tor-works\">an "
-"t-athsheachadán amach</a>  a úsáideann tú in ann ceangal a bhunú leis an "
-"suíomh atá uait, nó mura bhfuil sé ag lódáil i gceart. Má roghnaíonn tú é "
-"seo, athlódálfar an cluaisín nó an fhuinneog ghníomhach ar chiorcad nua Tor."
-" Úsáidfidh cluaisíní nó fuinneoga oscailte eile ón suíomh céanna an ciorcad "
-"nua seo freisin chomh luath is a athlódálfar iad. Ní ghlanann an rogha seo "
-"aon fhaisnéis phríobháideach, ní dhínascann sé do ghníomhaíocht, agus ní "
-"théann sé i bhfeidhm ar cheangail le suímh eile."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1240,12 +1161,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Déantar criptiú ar an trácht go léir idir úsáideoirí Tor agus seirbhísí "
-"Onion ó cheann go ceann, sa dóigh nach gá duit <a href=\"/secure-"
-"connections\">ceangal HTTPS a úsáid</a> riamh."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1324,12 +1242,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Agus is féidir leat deimhniú go bhfuil tú in ann seirbhísí Onion eile a "
-"rochtain trí cheangal a bhunú le <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\">Seirbhís Onion DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1425,19 +1339,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1448,19 +1354,11 @@ msgstr "Tuairisc.ie"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1471,10 +1369,6 @@ msgstr "An suíomh a dtugtar cuairt air."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1524,10 +1418,6 @@ msgstr "An bhfuil Tor in úsáid nó nach bhfuil."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1600,67 +1490,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Is Sábháilte"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Ag an leibhéal seo, caithfidh tú físeáin agus comhaid fuaime HTML5 a "
-"chliceáil chun iad a sheinm trí NoScript; ní chuirtear aon optamú JavaScript"
-" i bhfeidhm; seans nach dtaispeántar cothromóidí áirithe matamaiticiúla i "
-"gceart; ní úsáidtear gnéithe áirithe agus clófhoirne á dtarraingt ar an "
-"scáileán; ní thaispeántar cineálacha áirithe íomhá; tá JavaScript "
-"díchumasaithe de réir réamhshocraithe ar gach suíomh; tá an chuid is mó de "
-"na formáidí físe agus fuaime díchumasaithe; agus ní thaispeántar roinnt "
-"clófhoirne agus deilbhíní i gceart."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Níos Sábháilte"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Ag an leibhéal seo, caithfidh tú físeáin agus comhaid fuaime HTML5 a "
-"chliceáil chun iad a sheinm trí NoScript; ní chuirtear aon optamú JavaScript"
-" i bhfeidhm; seans nach dtaispeántar cothromóidí áirithe matamaiticiúla i "
-"gceart; ní úsáidtear gnéithe áirithe agus clófhoirne á dtarraingt ar an "
-"scáileán; ní thaispeántar cineálacha áirithe íomhá; agus tá JavaScript "
-"díchumasaithe de réir réamhshocraithe ar gach suíomh nach mbaineann úsáid as"
-" <a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Gnáthshlándáil"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Ag an leibhéal seo, tá gach gné cumasaithe. Seo an rogha is inúsáidte."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1751,32 +1624,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1787,7 +1657,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1893,12 +1763,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Chun Brabhsálaí Tor a bhaint de do chóras, scrios an fillteán ina bhfuil sé "
-"(féach ar <a href='uninstalling'>Díshuiteáil</a> le tuilleadh eolais a "
-"fháil)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1994,19 +1860,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Ba chóir d'úsáideoirí a dteastaíonn slándáil an-daingean uathu an <a href"
-"=\"/security-slider\">Sleamhnán Slándála</a> i mBrabhsálaí Tor a shocrú go "
-"dtí “Níos Sábháilte” (a dhíchumasaíonn JavaScript ar shuímh nach n-úsáideann"
-" HTTPS) nó “Is Sábháilte” (a dhíchumasaíonn ar gach suíomh é). Ach, má "
-"dhíchumasaíonn tú JavaScript, ní fheidhmeoidh go leor suíomh mar is ceart, "
-"agus dá bharr sin ligeann Brabhsálaí Tor do gach suíomh scripteanna a rith "
-"de réir réamhshocraithe."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2128,13 +1987,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Mura bhfuil tú in ann ceangal fós, b'fhéidir go bhfuil do Sholáthraí "
-"Seirbhíse Idirlín ag déanamh cinsireacht ar líonra Tor. Léigh an leathanach "
-"<a href=\"/circumvention\">Timpeallú</a> le foghlaim conas is féidir an "
-"fhadhb a réiteach."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2145,14 +2000,9 @@ msgstr "##### FADHBANNA AR EOLAS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tá Brabhsálaí Tor á fhorbairt ar bhonn leanúnach, agus tá a fhios againn "
-"faoi roinnt fadhbanna nach bhfuil réiteach orthu fós. Féach ar an leathanach"
-" <a href=\"/known-issues\">Fadhbanna ar eolas</a> le féachaint an bhfuil an "
-"fhadhb a fheiceann tusa ann cheana."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2250,11 +2100,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Dá bharr sin, <mark><a href=\"https://blog.torproject.org/bittorrent-over-"
-"tor-isnt-good-idea\">níl sé sábháilte BitTorrent a úsáid le Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2268,46 +2116,118 @@ msgstr "Conas Brabhsálaí Tor a bhaint de do chóras"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Tá sé an-éasca Brabhsálaí Tor a bhaint de do chóras:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Ní théann Brabhsálaí Tor i bhfeidhm ar aon bhogearraí eile ar do ríomhaire, "
-"ná ar shocruithe do chórais. Má bhaineann tú Brabhsálaí Tor de do ríomhaire,"
-" ní rachaidh sé i bhfeidhm ar bhogearraí ná ar shocruithe do chórais."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Tá sé an-éasca Brabhsálaí Tor a bhaint de do chóras:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Scrios an feidhmchlár nó an fillteán ina bhfuil Brabhsálaí Tor."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Folmhaigh an Bruscar."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Scrios fillteán Bhrabhsálaí Tor."
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Folmhaigh an Bruscar"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Tabhair faoi deara nach mbaintear úsáid as an ngnáthuirlis \"Uninstall\" ar "
-"do chóras."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+he.po b/contents+he.po
index fd5955db2..8a251f617 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: ION, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -187,12 +187,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"כברירת מחדל, דפדפן Tor אינו שומר היסטוריה כלשהי של גלישה. עוגיות תקפות רק "
-"עבור שיח יחיד (עד שדפדפן Tor ייצא או עד ש<a href=\"/managing-identities"
-"/#new-identity\">זהות חדשה</a> נדרשת)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -404,14 +401,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"ברוב המקרים, בחירת \"התחבר\" תתיר לך להתחבר אל רשת Tor ללא כל תצורה נוספת. "
-"ברגע שלחצת, שורת מיצב תופיע, המראה את התקדמות החיבור של Tor. אם אתה על חיבור"
-" מהיר יחסית, אבל שורה זו נראית תקועה בנקודה מסוימת, ראה את הדף <a "
-"href=\"/troubleshooting\">פתרון תקלות</a> לעזרה בפתרון הבעיה."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -442,13 +434,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"המסך הראשון שואל אם גישה אל רשת Tor חסומה או מצונזרת על חיבורך. אם אינך "
-"מאמין שזהו המקרה, בחר “לא“. אם אתה יודע שחיבורך מצונזר, או שניסית ונכשלת "
-"להתחבר אל רשת Tor ופתרונות אחרים לא עבדו, בחר “כן“. לאחר מכן תועבר אל המסך "
-"<a href=\"/circumvention\">עקיפה</a> כדי לתצר תעבורה נתיקה."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -490,18 +478,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"רוב <a href=\"/transports\">התעבורות הנתיקות</a>, כגון obfs3 ו-obfs4, "
-"מסתמכות על השימוש של ממסרי ”גשר”. כמו ממסרי Tor מצויים, גשרים מורצים ע\"י "
-"מתנדבים; לא כמו ממסרים מצויים, אמנם, הם אינם נמצאים ברשימה באופן ציבורי, כך "
-"שיריבים אינם יכולים לזהות אותם בקלות. שימוש בגשרים בשילוב עם תעבורה נתיקה "
-"עוזר להסוות את העובדה שאתה משתמש ב־Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -662,8 +644,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -673,13 +655,12 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 גורם לתעבורת Tor להיראות אקראית, כך שהוא אינו נראה כמו Tor או פרוטוקול"
-" אחר כלשהו. בעוד שהוא עדין כלול כברירת מחדל, מומלץ להשתמש ב־obfs4, מאחר שיש "
-"לו שיפורי אבטחה על פני obfs3."
+"obfs4 גורם לתעבורת Tor להיראות אקראית כמו obfs3, וגם מונעת ממצנזרים למצוא "
+"גשרים ע\"י סריקת האינטרנט. גשרי obfs4 פחות סבירים להיחסם מאשר גשרי obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -693,21 +674,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 גורם לתעבורת Tor להיראות אקראית כמו obfs3, וגם מונעת ממצנזרים למצוא "
-"גשרים ע\"י סריקת האינטרנט. גשרי obfs4 פחות סבירים להיחסם מאשר גשרי obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -831,14 +797,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"גישה ישירה אל רשת Tor עשויה לפעמים להיחסם ע\"י ספק שירותי האינטרנט שלך או "
-"ע\"י ממשלה. דפדפן Tor מכיל מספר כליי עקיפה לעיקוף חסימות אלו. כלים אלו "
-"נקראים ”תעבורות נתיקות”. ראה את הדף <a href=\"/en-US/transports\">תעבורות "
-"נתיקות</a> לעוד מידע על סוגי התעבורה שזמינים כרגע."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -894,34 +855,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"כל אחת מהתעבורות הנמצאות ברשימה בתפריט של משגר Tor עובדת בדרך שונה (לעוד "
-"פרטים, ראה את הדף <a href=\"/en-US/transports\">תעבורות נתיקות</a>), "
-"ויעילותן תלויה בנסיבות היחידניות שלך."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"אם אתה מנסה לעקוף חיבור חסום בפעם הראשונה, אתה צריך לנסות את התובלות השונות:"
-" obfs3, obfs4, fte ו־meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"אם תנסה את כל האפשרויות האלו ואף אחת מהן לא תעשה אותך מקוון, תצטרך להכניס "
-"כתובות גשר באופן ידני. קרא את הקטע <a href=\"/en-US/bridges/\">גשרים</a> כדי"
-" ללמוד מהם גשרים וכיצד להשיגם."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1013,16 +964,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
-"במעגל, צומת השומר או צומת הכניסה הוא הצומת הראשון והוא נבחר אוטומטית ואקראית"
-" ע\"י Tor. אבל הוא שונה מצמתים אחרים במעגל. על מנת להימנע ממתקפות פרופיל, "
-"צומת השומר משתנה רק לאחר 2-3 חודשים, ובשונה מצמתים אחרים, אשר משתנים עם כל "
-"תחום חדש. לעוד מידע אודות שומרים, היווץ ב<a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">שאלות נפוצות</a> "
-"וב<a href=\"https://support.torproject.org/tbb/tbb-2/\">פורטל התמיכה</a>."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1067,11 +1012,9 @@ msgstr "כשאתה מתחבר אל אתר על גבי Tor, ישנן מספר נ
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* ראה את הדף </a>חיבורים מאובטחים<a href=\"/secure-connections\"> למידע חשוב"
-" על כיצד לאבטח את החיבור שלך בעת התחברות לאתרים."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1137,20 +1080,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"אפשרות זו שימושית אם <a href=\"/about/#how-tor-works\">ממסר היציאה</a> שבו "
-"אתה משתמש אינו מסוגל להתחבר אל האתר שאתה דורש או שהאתר אינו נטען כראוי. "
-"בחירת האפשרות תגרום ללשונית או לחלון הפעילים כרגע להיטען מחדש על גבי מעגל "
-"Tor חדש. לשוניות וחלונות פתוחים אחרים מאותו אתר ישתמשו במעגל החדש גם כן ברגע"
-" שהם ייטענו. אפשרות זו אינה מנקה מידע פרטי כלשהו או מבטלת קישור של פרטיותך, "
-"אף לא משפיעה על החיבורים הנוכחיים שלך אל אתרים אחרים."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1201,11 +1138,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"כל התעבורה בין Tor ושירותי הבצל היא מוצפנת מקצה לקצה, כך שאינך צריך לדאוג "
-"לגבי <a href=\"/secure-connections\">התחברות על פני HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1277,11 +1212,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"אתה יכול גם לוודא שאתה מסוגל לקבל גישה אל שירותי בצל אחרים ע\"י התחברות אל "
-"<a href=\"http://3g2upl4pq6kufc4m.onion/\">שירותי בצל של DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1369,19 +1301,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1392,19 +1316,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1415,10 +1331,6 @@ msgstr "האתר מבוקר."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1466,10 +1378,6 @@ msgstr "האם Tor נמצא בשימוש או לא."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1538,61 +1446,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "הכי בטוח"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"ברמה זו, מדית HTML5 של שמע ווידיאו נעשית לחץ-כדי-לנגן באמצעות NoScript; כל "
-"מיטובי הביצוע של JavaScript מושבתים; מספר משוואות מתמטיות עשויות לא להיות "
-"מוצגות כראוי; מספר מאפיינים של תיצוג גופנים מושבתים; מספר סוגים של תמונות "
-"מושבתים; JavaScript מושבת כברירת מחדל בכל האתרים; רוב התסדירים של וידיאו "
-"ושמע מושבתים; ומספר גופנים וצלמיות עשויים לא להיות מוצגים כראוי."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "בטוח יותר"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"ברמה זו, מדית HTML5 של שמע ווידיאו נעשית לחץ־כדי־לנגן באמצעות NoScript; כל "
-"מיטובי הביצוע של JavaScript מושבתים; מספר משוואות מתמטיות עשויות לא להיות "
-"מוצגות כראוי; מספר מאפיינים של תיצוג גופנים מושבתים; מספר סוגים של תמונות "
-"מושבתים; ו־JavaScript מושבת כברירת מחדל בכל האתרים הבלתי־<a href=\"/secure-"
-"connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "תקני"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
-msgstr "ברמה זו, כל מאפייני הדפדפן מאופשרים. זוהי האפשרות השמישה ביותר."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1693,36 +1590,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "ברמה זו, כל המאפיינים של דפדפן Tor ומאפייני אתר מאופשרים."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "רמה זו משביתה מאפייני אתר המסוכנים לעיתים קרובות."
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "זה עשוי לגרום למספר אתרים לאבד תפקודיות."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript מושבת בכל אתרי אי־<a href=\"/secure-connections\">HTTPS</a>; מספר"
-" גופנים וסמלים מתמטיים מושבתים; שמע ווידיאו (מדית HTML5) הם לחץ־כדי־לנגן."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"רמה זו מתירה רק מאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1732,12 +1623,10 @@ msgstr "שינויים אלו משפיעים על תמונות, מדיה ותס
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript מושבת כברירת מחדל בכל האתרים; מספר גופנים, צלמיות, סמלים מתמטיים "
-"ותמונות מושבתים; שמע ווידיאו (מדית HTML5) הם לחץ־כדי־לנגן."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1832,11 +1721,8 @@ msgstr "כשתתבקש לעדכן את דפדפן Tor, סיים את שיח הג
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"הסר את דפדפן Tor מהמערכת שלך ע\"י מחיקת התיקייה שמכילה אותו (ראה את הקטע <a "
-"href='uninstalling'>הסרה</a> לעוד מידע)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1924,18 +1810,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"משתמשים אשר דורשים דרגה גבוהה של אבטחה בגלישתם צריכים להגדיר את <a href"
-"=\"/security-slider\">מחוון האבטחה</a> של דפדפן Tor אל ”בטוח יותר“ (אשר "
-"משבית JavaScript עבור אתרי בלתי־HTTPS) או אל ”הכי בטוח“ (אשר עושה זאת עבור "
-"כל האתרים). לעומת זאת, השבתת JavaScript תמנע מאתרים רבים להיות מוצגים בצורה "
-"נכונה, כך שהגדרת ברירת המחדל של דפדפן Tor היא להתיר לכל האתרים להריץ תסריטים"
-" במצב \"תקני\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2049,11 +1929,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"אם עדין אינך יכול להתחבר, ספק שירותי האינטרנט שלך יתכן מצנזר חיבורים לרשת "
-"Tor. קרא את הקטע <a href=\"/circumvention\">עקיפה</a> עבור פתרונות אפשריים."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2064,13 +1942,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"דפדפן Tor הוא תחת פיתוח תמידי, ומספר סוגיות ידועות לגביהן אבל עדין לא תוקנו."
-" אנא בדוק את הדף <a href=\"/known-issues\">סוגיות ידועות</a> כדי לראות אם "
-"הבעיה שאתה חווה כבר נמצאת ברשימה שם."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2163,11 +2037,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent הוא בפרט <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">אינו אלמוני על גבי Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2181,43 +2053,118 @@ msgstr "איך להסיר את דפדפן Tor מהמערכת שלך"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "הסרת דפדפן Tor מהמערכת שלך היא פשוטה:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"דפדפן Tor אינו משפיע על תוכנה קיימת כלשהי או הגדרות קיימות כלשהן במחשב שלך. "
-"הסרת דפדפן Tor לא תשפיע על התוכנה או ההגדרות של המחשב שלך."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "הסרת דפדפן Tor מהמערכת שלך היא פשוטה:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* מחק את התיקייה או היישום של Tor."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* רוקן את האשפה שלך"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. מחק את תיקיית דפדפן Tor שלך."
+msgid "On Linux:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. רוקן את האשפה שלך"
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "שים לב שהתועלת התקנית ”הסרה” של מערכת ההפעלה שלך אינה בשימוש."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+hr.po b/contents+hr.po
index 30065b457..cfc5b986a 100644
--- a/contents+hr.po
+++ b/contents+hr.po
@@ -1,5 +1,4 @@
 # Translators:
-# Karlo Prikratki <karlo at karloprikratki.com>, 2018
 # Emma Peel, 2019
 # erinm, 2019
 # 
@@ -7,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
@@ -191,12 +190,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Pod zadano, Tor Browser ne zadržava nikakvu povijest pregledavanja. Kolačići"
-" su valjani samo za jednu sesiju (dok ne izađete iz Tor Browsera ili dok ne "
-"zatražite <a href=\"/managing-identities#new-identity\">Novi identitet</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -402,16 +398,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"U većini slučajeva, biranje opcije \"Spoji se\" će Vam omogućiti spajanje na"
-" Tor mrežu bez ikakve daljnje konfiguracije. Kad kliknete gumb, pojavit će "
-"se statusna traka koja pokazuje progres Torovog spajanja. Ako ste na "
-"relativno brzoj vezi, a ova traka izgleda kao da je zapela, pogledajte "
-"stranicu za <a href=\"troubleshooting\">Rješavanje problema</a> kako bi "
-"dobili pomoć."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -443,15 +432,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Prvi zaslon Vas pita ako je pristup Tor mreži blokiran ili cenzuriran na "
-"Vašoj vezi. Ako vjerujete da to nije slučaj, odaberite \"Ne\". Ako znate da "
-"je Vaša veza cenzurirana ili ste se pokušali spojiti na Tor mrežu bez "
-"uspjeha, a sva ostala rješenja nisu uspjela, odaberite \"Da\". Bit ćete "
-"preumsjereni na zaslon <a href=\"circumvention\">Obilaženje</a> kako bi "
-"konfigurirali priključni transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -495,19 +478,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Većina  <a href=\"transports\">priključnih transporta</a>, kao obfs3 i "
-"obfs4, se oslanja na korištenje \"mostova\" kao releja. Kao i obične Tor "
-"releje, mostove pokreću volonteri; no za razliku od uobičajenih releja,  "
-"mostovi nisu izlistani javno, tako da ih protivnici ne mogu jednostavno "
-"identificirati. Korištenje mostova u kombinaciji sa priključnim transportima"
-" pomaže sakriti činjenicu da koristite Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -657,8 +633,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -668,10 +644,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 prikazuje Torov promet kao nasumičan, jednako kao i obfs3, uz dodatak "
+"da sprječava cenzore od pronalaženja mostova. obfs4 mostovi imaju manje "
+"šanse da će biti blokirani."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -685,22 +664,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 prikazuje Torov promet kao nasumičan, jednako kao i obfs3, uz dodatak "
-"da sprječava cenzore od pronalaženja mostova. obfs4 mostovi imaju manje "
-"šanse da će biti blokirani."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -814,15 +777,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Direktni pristup Tor mreži može ponekad biti bolkiran od strane Vašeg "
-"davatelja internet usluge ili od strane vlade. Tro Browser uključuje neke "
-"alate za obilaženje tih blokada. Ovi alati se kolektivno zovu \"priključni "
-"transporti\". Pogledajte stranicu <a href=\"/en-US/transports\">priključni "
-"transporti</a> kako bi saznali više o trenutno dostupnim transportima."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -872,33 +829,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Svaki transport izlistan izborniku Tor Launchera radi na drugačiji način (za"
-" više detalja, pogledajte stranicu o <a href=\"/en-"
-"US/transports\">priključnim transportima</a>), i njihova efikasnost ovisi o "
-"Vašim individualnim okolnostima."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Ako pokušate sve ove opcije i nijedna vas ne spoji, morat ćete ručno unijeti"
-" adrese mostova. Pročitajte dio o <a href=\"/en-US/bridges/\">Mostovima</a> "
-"kako bi naučili što su mostovi i kako ih dobiti."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -994,9 +942,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1045,12 +993,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Pogledajte stranicu <a href=\"/hr/secure-connections\">Sigurne veze</a> da"
-" vidite važne informacije o tome kako osigurati svoju vezu dok se "
-"prijavljujete."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1117,13 +1062,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1174,12 +1119,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Sav promet između Tor korisnika i onion usluga je enkriptiran s kraja na "
-"kraj, tako da se ne morate brinuti o <a href=\"/hr/secure-"
-"connections\">spajanju preko HTTPS-a</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1250,11 +1192,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Možete potvrditi da imate mogućnost spajanja na onion usluge spajanjem na <a"
-" href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo onion uslugu</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1347,19 +1286,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1370,19 +1301,11 @@ msgstr "Stranica.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1393,10 +1316,6 @@ msgstr "Stranica koja se posjećuje."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1446,10 +1365,6 @@ msgstr "Koristi li se Tor ili ne."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1522,65 +1437,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Najsigurnije"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Na ovoj razini, HTML5 video i audio mediji postaju klikni-za-repordukciju, "
-"putem NoScripta; sve optimizacije performansi JavaScripta su onemogućene; "
-"neke matematičke jednadžbe se možda neće prikazati ispravno; neki fontovi su"
-" onemogućeni; neke vrste slika su onemogućene; JavaScript je onemogućen pod "
-"zadano na svim stranicama; većina audio i video formata je onemogućena; i "
-"neki fontovi i ikone se možda neće ispravno prikazivati."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Sigurnije"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Na ovoj razini, HTML5 video i audio mediji postaju klikni-za-reprodukciju, "
-"putem NoScripta; sve optimizacije performansi JavaScripta su onemogućene; "
-"neke matematičke jednadžbe se možda neće prikazati ispravno; neki fonotvi su"
-" onemogućeni, neke vrste slika su onemogućene,; i JavaScript je onemogućen "
-"pod zadano na svim ne-<a href=\"/hr/secure-connections\">HTTPS</a> "
-"stranicama."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standardno"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Na ovoj razini, sve značajke preglednika su omogućene. Na ovoj razini je "
-"preglednik najupotrebljiviji."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1671,32 +1571,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1707,7 +1604,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1811,12 +1708,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Uklonite Tor Browser iz svog sustava brisanjem direktorija u kojem se nalazi"
-" (vidjeti dio o <a href=\"uninstalling\">Deinstaliranju</a> za više "
-"informacija)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1905,11 +1798,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -2029,12 +1922,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Ako se i dalje ne možete spojiti, postoji mogućnost da Vaš davatelj internet"
-" usluge cenzurira veze na Tor mrežu. Pročitajte dio o  <a "
-"href=\"circumvention\">Obilaženju</a> kako bi našli moguća rješenja."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2045,13 +1935,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser se stalno razvija, i neki problemi su nam poznati, ali nisu još "
-"riješeni. Provjerite stranicu o <a href=\"known-issues\">Poznatim "
-"problemima</a> da vidite ako je problem kojeg imate tamo prikazan."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2147,8 +2033,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2163,46 +2049,118 @@ msgstr "Kako ukloniti Tor Browser iz Vašeg sustava"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Uklanjanje Tor Browsera iz Vašeg sustava je jednostavno:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser ne utječe na ikoji od postojećeg softwarea ili postavki Vašeg "
-"računala. Uklanjanje Tor Browsera neće utjecati na software ili postavke "
-"Vašeg računala."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Uklanjanje Tor Browsera iz Vašeg sustava je jednostavno:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Obrišite Tor Browser direktorij."
+msgid "On Linux:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Ispraznite koš za smeće"
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Napominjemo da se mogućnost \"Deinstaliraj\" unutar Vašeg operativnog "
-"sustava ne koristi."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+hu.po b/contents+hu.po
index ce9499da8..48c38ae07 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: István Dávid <istvandavid at icloud.com>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
@@ -193,13 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Alapvetően a Tor Böngésző nem ment semmilyen böngészési előzményt. A sütik "
-"csak egy munkafázisig érvényesek(ameddig ki nem lépnek a Tor Böngészőből, "
-"vagy egy <a href=\"/managing-identities/#new-identity\">Új Identitást</a> "
-"nem kérnek)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -421,15 +417,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"A legtöbb esetben a \"Kapcsolódás\" kiválasztása lehetővé teszi, hogy "
-"további konfiguráció nélkül csatlakozzon a Tor hálózathoz. Miután "
-"rákattintott, megjelenik egy állapotsor, amely a Tor kapcsolatát mutatja. Ha"
-" viszonylag gyors kapcsolata van, de ez a sáv úgy tűnik, hogy elakad egy "
-"bizonyos ponton, olvassa el a Hibaelhárítás oldalt a probléma megoldásához."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -460,16 +450,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Az első képernyő megkérdezi, hogy a Tor hálózathoz való hozzáférés blokkolva"
-" vagy cenzúrázva van-e a szolgáltatójánál. Ha nem hiszi, hogy ez a helyzet, "
-"válassza a „Nem” lehetőséget. Ha tudja, hogy a kapcsolat cenzúrázott, vagy "
-"megpróbált csatlakozni a Tor hálózathoz, de hibába ütközött, akkor válassza "
-"az „Igen” lehetőséget. Ezután eljut a <a "
-"href=\"/circumvention\">Kijátszás</a> képernyőhöz, hogy konfigurálni tudjon "
-"egy szállítót."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -511,12 +494,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -677,8 +659,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -688,9 +670,9 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -705,19 +687,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -829,9 +798,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -882,25 +850,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -977,9 +943,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1018,8 +984,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1074,13 +1040,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1125,8 +1091,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1189,8 +1155,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1268,19 +1233,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1291,19 +1248,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1314,10 +1263,6 @@ msgstr "Korábban meglátogatott webhely."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1365,10 +1310,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1431,13 +1372,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Legbiztonságosabb"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1449,31 +1390,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Biztonságosabb"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Normál"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1566,32 +1506,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1602,7 +1539,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1695,8 +1632,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1772,11 +1708,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1895,12 +1831,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Ha még mindig nem tud csatlakozni, az internetszolgáltató esetleg cenzúrázza"
-" a kapcsolatot a Tor hálózattal. Olvassa el a <a "
-"href=\"/circumvention\">Kijátszás</a> részt a lehetséges megoldásokhoz."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1911,14 +1844,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"A Tor Browser folyamatos fejlesztés alatt áll, és néhány kérdés ismert, de "
-"még nem rögzített. Kérjük, ellenőrizze az <a href=\"/known-issues\">Ismert "
-"problémák oldalt</a>, hogy megtudja, hogy a felmerült probléma már "
-"szerepel-e ott."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2014,12 +1942,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* A BitTorrent konkrétan <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">nem biztosít névtelenséget a Tor "
-"felett</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2033,46 +1958,118 @@ msgstr "Hogyan távolítható el a Tor Browser a rendszerből"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "A Tor Browser eltávolítása a rendszerből egyszerű:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"A Tor Browser nem befolyásolja a számítógép meglévő szoftverét vagy "
-"beállításait. A Tor Browser eltávolítása nem befolyásolja a rendszer "
-"szoftverét vagy beállításait."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "A Tor Browser eltávolítása a rendszerből egyszerű:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Törölje a Tor Browser mappát."
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Ürítse ki a lomtárat"
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Ne feledje, hogy az operációs rendszer szabványos „Uninstall” "
-"segédprogramját nem tudja használni."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+id.po b/contents+id.po
index ae5f8d891..33c042f20 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -1,17 +1,17 @@
 # Translators:
 # Muhammad Yusuf <myusuffin at gmail.com>, 2018
-# erinm, 2019
 # Cadas Propopuli Azzam Baribin <cadas.propopuli at gmail.com>, 2019
 # Emma Peel, 2019
 # ical, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: ical, 2019\n"
+"Last-Translator: erinm, 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"
@@ -194,13 +194,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Secara bawaan, Tor Browser tidak menyimpan riwayat penelusuran. Cookies "
-"hanya valid untuk sesi tunggal (hingga Tor Browser ditutup atau sebuah <a "
-"href=\"/id/managing-identities/#identitas-baru\">Identitas Baru</a> "
-"diminta)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -431,16 +427,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Dalam kebanyakan kasus, memilih \"Sambung\" akan memungkinkan Anda terhubung"
-" ke jaringan Tor tanpa konfigurasi lebih lanjut. Setelah diklik, bar status "
-"akan muncul, menunjukkan perkembangan koneksi Tor. Jika Anda berada pada "
-"koneksi yang relatif cepat, namun bar ini tampaknya macet pada titik "
-"tertentu, lihat halaman <a href=\"/troubleshooting\">Pemecahan Masalah</a> "
-"untuk mendapatkan bantuan dalam menyelesaikan masalah."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -472,16 +461,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Layar pertama menanyakan jika akses ke jaringan Tor di blokir atau di sensor"
-" pada koneksi Anda. Jika Anda tidak yakin hal ini adalah persoalannya, pilih"
-" \"Tidak\". Jika anda mengetahui bahwa koneksi Anda disensor, atau Anda "
-"telah mencoba dan gagal terhubung dengan jaringan Tor dan tidak ada solusi "
-"lain yang berhasil, pilih \"Ya\". Anda akan dibawa pada layar <a "
-"href=\"/circumvention\">pengelakan</a>untuk mengkonfigurasi pluggable "
-"transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -526,20 +508,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Kebanyakan <a href=\"/transports\">Angkutan Colok</a>, seperti obfs3 dan "
-"obfs4, bergantung pada penggunaan \"jembatan\" relay. Seperti relay-relay "
-"Tor biasa, jembatan-jembatan ini dijalankan oleh para relawan; namun tidak "
-"seperti relay pada umumnya, mereka tidak terdaftar secara publik, sehingga "
-"seorang lawan tidak dapat mengidentifikasi pengguna dengan mudah. "
-"Menggunakan jembatan-jembatan dikombinasikan dengan angkutan colok membantu "
-"menyamarkan fakta bahwa anda sedang menggunakan Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -709,8 +683,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -720,14 +694,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 membuat lalu lintas Tor terlihat acak, membuatnya jadi tidak tampak "
-"seperti Tor atau protokol lainnya. Walaupun secara bawaan obfs3 masih "
-"disertakan, disarankan untuk menggunakan obfs4 sebagai gantinya, karena "
-"obfs4 memiliki beberapa peningkatan keamanan dibandingkan obfs3."
+"obfs4 membuat lalu lintas Tor tampak acak seperti obfs3, dan juga mencegah "
+"sensor dari menemukan bridges oleh pemindaian internet. obfs4 bridges "
+"sedikit mirip dalam blokir dibandingkan obfs3 bridges."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -741,22 +714,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 membuat lalu lintas Tor tampak acak seperti obfs3, dan juga mencegah "
-"sensor dari menemukan bridges oleh pemindaian internet. obfs4 bridges "
-"sedikit mirip dalam blokir dibandingkan obfs3 bridges."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -887,16 +844,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Akses langsung pada jaringan Tor terkadang bisa diblokir oleh penyedia "
-"layanan internet atau oleh pemerintah. Tor Browser termasuk beberapa "
-"perangkat mengelak untuk mengatasi pemblokiran ini. Perangkat-perangkat ini "
-"disebut \"Angkutan Colok\". Lihat halaman <a href=\"/en-"
-"US/transports\">Angkutan Colok</a> untuk informasi lebih tentang jenis "
-"angkutan yang tersedia."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -956,36 +906,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Setiap transports yang terdaftar dalam menu Peluncur Tor bekerja dengan cara"
-" berbeda (untuk detil, lihat laman<a href=\"/en-US/transports\">Angkutan "
-"Colok</a>), dan efektivitasnya bergantung pada keadaan anda."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Jika Anda mencoba mengelak dari koneksi yang diblokir untuk pertama kali, "
-"Anda perlu mencoba pluggable transport yang berbeda: obfs3, obfs4, fte, dan "
-"meek-azure"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Jika anda mencoba semua opsi yang tersedia, dan tidak ada yang membuat anda "
-"daring, anda oerlu untuk memasukkan alamat jembatan secara manual. Baca "
-"bagian<a href=\"/en-US/bridges/\">Jembatan-jembatan</a> untuk mempelajari "
-"apa itu jembatan dan bagaimana mendapatkannya."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1083,17 +1021,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Di sirkuit, node Pelindung atau node masuk adalah node pertama dan dipilih "
-"secara otomatis dan acak oleh Tor. Tapi ini berbeda dari node lainnya di "
-"dalam sirkuit. Untuk menghindari serangan profiling, node Pelindung akan "
-"berubah dalam waktu 2-3 bulan, tidak seperti node lainnya, yang berubah "
-"setiap domain baru. Untuk informasi lebih lanjut tentang Pelindung, lihat <a"
-" href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a>dan<a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Portal Dukungan</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1142,12 +1073,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Lihat halaman <a href=\"/id/secure-connections\">Secure "
-"Connections</a>untuk informasi penting tentang cara mengamankan koneksi Anda"
-" saat login."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1217,23 +1145,14 @@ msgstr "###### SIRKUIT TOR BARU UNTUK SITUS INI"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Pilihan ini berguna jika <a href=\"/about/#how-tor-works\">exit relay</a> "
-"anda menggunakan saat tidak dapat terhubung dengan situs yang ada inginkan, "
-"atau tidak berjalan dengan baik. Memilih itu akan menyebabkan tab yang aktif"
-" saat ini atau jendela yang sedang berjalan melalui sebuah sirkuit Tor yang "
-"baru. Tabs lain yang sedang terbuka dan jendela dari website yang sama akan "
-"menggunakan sirkuit yang baru demikian juga dengan yang sedang dijalankan. "
-"Opsi ini tidak akan menghilangkan setiap infomasi pribadi atau tidak "
-"menghubungkan aktivitas anda, tidak juga berdampak pada koneksi anda saat "
-"ini pada website yang lain. "
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1286,12 +1205,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Semua lalu lintas antara pengguna Tor dan layanan onion terenkripsi dari "
-"ujung ke ujung, jadi anda tidak perlu khawatir untuk <a href=\"/id/secure-"
-"connections\">menghubungkan melalui HTTPS</a>"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1369,12 +1285,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Anda juga bisa memastikan bahwa Anda dapat mengakes layanan onion lain "
-"dengan tersambung ke <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's"
-" Onion Service</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1470,19 +1382,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1493,19 +1397,11 @@ msgstr "Situs.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1516,10 +1412,6 @@ msgstr "Situs telah dikunjungi."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1569,10 +1461,6 @@ msgstr "Apakah Tor sedang dipakai atau tidak."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1643,67 +1531,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Paling aman"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Pada tingkat ini, media video dan audio HTML 5 menjadi klik-untuk- memainkan"
-" melalui NoScript; setiap optimalisasi tampilan JavaScript menjadi non-"
-"aktif;  beberapa persamaan matematika kemungkinan tidak ditampilkan secara "
-"benar; beberapa fitur terjemahan huruf  menjadi non-aktif; beberapa tipe "
-"dari gambar menjadi non-aktif;  Javascript menjadi non-aktif secara otomatis"
-" pada seluruh situs; hampir semua video dan audio format menjadi non-aktif; "
-"dan beberapa huruf dan ikon kemungkinan tidak dapat ditampilkan secara "
-"tepat."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Lebih aman"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Pada level ini, HTML5 media audio dan visual menjadi click-to-play lewat "
-"NoScript; semua optimalisasi kinerja JavaScript akan di-nonaktif-kan; "
-"beberapa formula matematika kemngkinan tidak ditampilkan secara baik; "
-"sejumlah perubahan fitur huruf di-nonaktif-kan; sejumlah jenis gambar di-"
-"nonaktif-kan; dan JavaScript di-nonaktif-kan secara otomatif pada semua "
-"non-<a href=\"/id/secure-connections\">HTTPS</a>sites"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standar"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Pada level ini, semua fitur peramban dapat digunakan. Ini adalah pilihan "
-"yang paling berguna."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1817,40 +1688,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Pada tingkat ini, semua fitur-fitur Tor Browser dan situs web diaktifkan."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Tingkat ini menonaktifkan fitur-fitur situs web yang sering kali berbahaya."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Ini mungkin menyebabkan beberapa situs kehilangan fungsinya."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript dinonaktifkan pada semua situs non-<a href=\"/secure-"
-"connections\">HTTPS</a>; beberapa font dan simbol matematika dinonaktifkan; "
-"audio dan video (media HTML5) dijalankan saat diklik."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Tingkat ini hanya memungkinkan fitur situs web yang diperlukan untuk situs "
-"statis dan layanan dasar."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1860,13 +1721,10 @@ msgstr "Perubahan ini mempengaruhi gambar, media, dan skrip."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript dinonaktifkan pada semua situs; beberapa font, ikon, simbol "
-"matematika, dan gambar dinonaktifkan; audio dan video (media HTML5) "
-"dijalankan saat diklik."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1965,12 +1823,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Copot Tor Browser dari sistem Anda dengan cara menghapus folder yang berisi "
-"file terkait (lihat <a href='uninstalling'>copot perangkat</a> bagian untuk "
-"informasi lanjut)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2065,20 +1919,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Pengguna yang menginginkan tingkat keamanan yang tinggi pada situs "
-"jelajahnya sebaiknya mengatur Tor Browser: <a href=\"/security-"
-"slider\">slider pengamanan</a>,  pada 'Safer\" (yang menon-aktifkan "
-"JavaScript untuk situs non-HTTPS) atau \"Safest\" (yang melakukan hal "
-"seperti itu pada semua situs) Namun, menonaktifkan JavaScript akan "
-"menyebabkan  banyak situs tidak muncul dengan betul, jadi pengaturan Tor "
-"Browser pada default adalah untuk memperbolehkan setiap situs untuk "
-"menjalankan skrip. "
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2199,12 +2045,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Jika Anda masih tak bisa terkoneksi, ISP Anda kemungkinan menghalangi "
-"koneksi ke jaringan Tor, baca <a href=\"/circumvention\">Perdaya</a> bagian "
-"untuk peluang solusi."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2215,14 +2058,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser selalu berada di bawah pengembangan, dan sejumlah persoalan "
-"telah diketahui tapi tidak bisa diperbaiki. Harap periksa <a href=\"/known-"
-"issues\">persoalan yang sudah diketahui</a> halaman untuk melihat "
-"persoalanmu sudah masuk ke dalam daftar ini."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2319,11 +2157,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent <mark><a href=\"https://blog.torproject.org/bittorrent-over-"
-"tor-isnt-good-idea\">tidak anonim di dalam Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2337,50 +2173,118 @@ msgstr "Cara mencopot Tor Browser dari sistem Anda"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Mencopot Tor Browser pada sistem Anda sangat mudah:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser tidak mempengaruhi perangkat dan pengaturan di dalam komputer "
-"Anda. Pencopotan Tor Browser tidak akan berpengaruh terhadap sistem "
-"perangkat dan pengaturan."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Mencopot Tor Browser pada sistem Anda sangat mudah:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Hapus folder atau aplikasi Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Kosongkan tempat sampah"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Tempatkan Tor Browser folder. Lokasi foldernya biasanya untuk Windows "
-"berada di Desktop; sementara pada macOS berada di Applications. Di Linux, "
-"tidak ada lokasi tertentu, tapi folder akan dinamakan \"tor-browser_en-US\" "
-"jika Anda menjalankan versi Inggris Tor Browser."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Hapus folder Tor Browser"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Kosongkan tempat sampah"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Perhatikan operating sistem anda standard \"Uninstall\" utilitas tidak "
-"digunakan."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+is.po b/contents+is.po
index 8e828e183..3baf63a3a 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,14 +1,14 @@
 # Translators:
-# erinm, 2019
 # Sveinn í Felli <sv1 at fellsnet.is>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>, 2019\n"
+"Last-Translator: erinm, 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"
@@ -189,12 +189,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Sjálfgefið geymir Tor-vafrinn ekki neinn vafurferil. Vefkökur eru einungis "
-"gildar í stökum setum (þar til hætt er í Tor-vafranum eða beðið um <a href"
-"=\"/managing-identities/#new-identity\">Nýtt auðkenni</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -421,17 +418,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
-msgstr ""
-"Í flestum tilfellum er nóg að velja \"Tengjast\" til að tengjast Tor-netinu "
-"án frekari uppsetningar. Eftir að smellt er á hnappinn, mun framvindustika "
-"birtast sem sýnir hvernig gengur með að tengjast Tor. Ef þú ert á "
-"tiltölulega hraðvirku neti, en framvindan virðist stöðvast á einhverjum "
-"tilteknum tímapunkti, skaltu skoða síðuna um <a "
-"href=\"/troubleshooting\">Vandamálalausnir</a> til að finna aðstoð við að "
-"leysa þetta."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -463,16 +452,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Á fyrsta skjánum er spurt hvort Tor-netið sé hindrað eða ritskoðað á "
-"nettengingunni þinni. Ef þú heldur að það sé ekki tilfellið, skaltu velja "
-"“Nei”. Ef þú veist að nettengingin þín sé ritskoðuð, eða ef þú hefur þegar "
-"prófað og ekki tekist að tengjast Tor-netinu og engar aðrar lausnir hafa "
-"virkað, skaltu velja “Já”. Þá verður þú fluttur yfir á skjáinn <a "
-"href=\"/circumvention\">Hjáleiðir</a> til að setja upp tengileið (pluggable "
-"transport)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -517,20 +499,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Flestar <a href=\"/transports\">'pluggable transport'</a> tengileiðir, eins "
-"og t.d. obfs3 og obfs4, reiða sig á notkun brúarendurvarpa (bridge relay). "
-"Rétt eins og venjulegir Tor-endurvarpar, eru brýr reknar af sjálfboðaliðum; "
-"en ólíkt venjulegum endurvörpum, þá eru þær ekki birtar opinberlega, þannig "
-"að andstæðingar eiga ekki auðvelt um vik að finna þær. Samtvinnuð notkun "
-"brúa og 'pluggable transport' tengileiða hjálpar til við að fela notkun þína"
-" á Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -703,8 +677,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -714,14 +688,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 lætur umferð í gegnum Tor líta út fyrir að vera tilviljanakennda, á "
-"engann hátt neitt líkt Tor eða nokkrum öðrum samskiptamáta. Þrátt fyrir að "
-"obfs3 fylgi enn með venjulegri uppsetningu, þá er mælt með því að nota "
-"frekar obfs4, þar sem það er mun öruggara en obfs3."
+"obfs4 lætur umferð í gegnum Tor líta út fyrir að vera tilviljanakennda, rétt"
+" eins og obfs3, en kemur einnig í veg fyrir að hægt sé að finna brýr með "
+"netskönnun. Minni líkur eru á að lokað sé á obfs4-brýr heldur en obfs3-brýr."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -735,22 +708,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 lætur umferð í gegnum Tor líta út fyrir að vera tilviljanakennda, rétt"
-" eins og obfs3, en kemur einnig í veg fyrir að hægt sé að finna brýr með "
-"netskönnun. Minni líkur eru á að lokað sé á obfs4-brýr heldur en obfs3-brýr."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -880,16 +837,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Lokað getur verið á beinan aðgang að Tor-netkerfinu af netþjónustuaðilanum "
-"þínum (ISP) eða ríkisstjórn. Tor-vafrinn iniheldur ýmis verkfæri til að "
-"komast framhjá slíkum lokunum. Þessi verkfæri kallast “pluggable transport "
-"tengileiðir”. Skoðaðu síðuna <a href=\"/en-US/transports\">Pluggable "
-"Transport tengileiðir</a> til að sjá nánari upplýsingar um þær gerðir "
-"tengileiða sem tiltækar eru."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -949,37 +899,24 @@ msgstr "##### HVAÐA TENGILEIÐ ÆTTI ÉG AÐ NOTA?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Hver og ein tengileið sem taldar eru upp í valmynd Tor-ræsisins virkar á "
-"mismunandi hátt (skoðaðu <a href=\"/en-US/transports\">Pluggable Transport "
-"tengileiðir</a> síðuna fyrir nánari útlistun), og eru áhrif þeirra og virkni"
-" háð því í nákvæmlega hvaða aðstæðum þú ert."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Ef þú ert að reyna að komast framhjá útilokaðri tengingu í fyrsta skipti, "
-"ættirðu að prófa eftirfarandi  tengileiðir: obfs3, obfs4, fte, og meek-"
-"azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Ef þú prófar alla þessa valkosti og enginn þeirra getur tengt þig við netið,"
-" muntu þurfa að setja handvirkt inn vistföng fyrir brýr. Lestu kaflann um <a"
-" href=\"/en-US/bridges/\">Brýr</a> til að sjá hvað brýr eru og hvernig eigi "
-"að verða sér úti um þær."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1078,19 +1015,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Í rásinni er varðarhnúturinn (guard) eða inngangshnúturinn sama og fyrsti "
-"hnúturinn og er hann sjálfvirkt handahófskennt valinn af Tor. En hann er "
-"frábrugðinn öðrum hnútum í rásinni. Tl þess að koma í veg fyrir árásir þar "
-"sem útbúin eru persónusnið, er skipt um varðarhnút eftir 2-3 mánuði, ólíkt "
-"hinum hnútunum sem breytast við hvert nýtt lén. Til að sjá ítarlegri "
-"upplýsingar um Varðarhnúta / Guards ættirðu að skoða <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">Algengar spurningar"
-" -FAQ</a> og <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Aðstoðargátt</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1138,12 +1066,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Skoðaðu síðuna <a href=\"/secure-connections\">Öruggar tengingar</a> til "
-"að sjá mikilvægar upplýsingar um hvernig þú getur gert tenginguna þína "
-"örugga við innskráningu."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1214,22 +1139,14 @@ msgstr "###### NÝ TOR-RÁS FYRIR ÞETTA VEFSVÆÐI"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Þessi valkostur nýtist ef <a href=\"/about/#how-tor-"
-"works\">útgangsendurvarpinn</a> sem þú ert að nota getur ekki tengst umbeðnu"
-" vefsvæði, eða ef það hleðst ekki rétt inn. Sé þetta valið mun virkur flipi "
-"eða gluggi endurhlaðast í gegnum nýja Tor-rás. Aðrir opnir flipar og gluggar"
-" frá sama vefsvæði munu einni nota nýju rásina séu þeir endurlesnir. Þessi "
-"valkostur hreinsar ekki út neinar einkaupplýsingar eða aftengja fyrri virkni"
-" þína, né hefur það heldur áhrif á fyrirliggjandi tengingar þínar við önnur "
-"vefsvæði."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1282,12 +1199,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Öll umferð milli Tor-notenda og onion-þjónustna er enda-í-enda dulrituð, "
-"þannig að þú þarft ekki að hafa áhyggjur af því hvort verið sé að <a href"
-"=\"/secure-connections\">tengjast með HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1365,12 +1279,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Þú getur gengið úr skugga um hvort hægt sé að ná sambandi við aðrar onion-"
-"þjónustur með því að tengjast við <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\"> onion-þjónustu DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1464,19 +1374,11 @@ msgstr "##### MÖGULEGA SÝNILEG GÖGN"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1487,19 +1389,11 @@ msgstr "www.vefur.is"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1510,10 +1404,6 @@ msgstr "Vefsvæðið sem verið er að skoða."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1563,10 +1453,6 @@ msgstr "Hvort verið er að nota Tor eða ekki."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1638,65 +1524,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Öruggast"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Á þessu stigi verða HTML5-margmiðlunargögn undir 'smella-til-að-spila' í "
-"gegnum NoScript; allar afkastabætingar í gegnum JavaScript eru óvirkar; "
-"sumar stærðfræðijöfnur gætu birst skringilega; myndgerð sumra "
-"letureiginleika er óvirk; sumar gerðir myndskráa eru óvirkar; Javascript er "
-"sjálfgefið óvirkt á öllum vefsvæðum; flest snið myndskeiða og hljóðs eru "
-"óvirk; og einhver letur og táknmyndir munu ekki birtast rétt."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Öruggara"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Á þessu stigi verða HTML5-margmiðlunargögn undir 'smella-til-að-spila' í "
-"gegnum NoScript; allar afkastabætingar í gegnum JavaScript eru óvirkar; "
-"sumar stærðfræðijöfnur gætu birst skringilega; myndgerð sumra "
-"letureiginleika er óvirk; sumar gerðir myndskráa eru óvirkar; Javascript er "
-"sjálfgefið óvirkt á öllum vefsvæðum sem ekki nota <a href=\"/secure-"
-"connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Staðlað"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Á þessu öryggisstigi eru allir eiginleikar vafrans virkjaðir. Þetta er sá "
-"kostur sem nýtist við flest."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1809,43 +1680,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Á þessu öryggisstigi eru allir eiginleikar vafrans og vefsvæðisins "
-"virkjaðir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Á þessu öryggisstigi eru óvirkir þeir eiginleika vefsvæða sem geta reynst "
-"hættulegir."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Þetta gæti valdið takmörkunum á virkni sumra vefsvæða."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript er sjálfgefið óvirkt á öllum vefjum sem ekki nota <a href"
-"=\"/secure-connections\">HTTPS</a>; sumt letur og stærðfræðitákn eru gerð "
-"óvirk; smella verður á hljóð og myndskeið (HTML5-margmiðlun) til að þau "
-"spilist."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Þetta öryggisstig leyfir einungis þá eiginleika sem nauðsynlegir eru fyrir "
-"föst (static) vefsvæði og grunnþjónustur."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1855,13 +1713,10 @@ msgstr "Þessar breytingar hafa áhrif á myndir, margmiðlunargögn og skriftur
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript er sjálfgefið óvirkt á öllum vefjum; sumt letur, stærðfræðitákn "
-"og myndir eru gerð óvirk; smella verður á hljóð og myndskeið "
-"(HTML5-margmiðlun) til að þau spilist."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1962,12 +1817,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Fjarlægðu Tor-vafrann úr tölvunni með því að eyða möppunni sem inniheldur "
-"forritsskrárnar (skoðaðu kaflann <a href='uninstalling'>Taka út "
-"uppsetningu</a> til að sjá nánari upplýsingar)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2065,19 +1916,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Notendur sem þurfa hátt öryggisstig við vafur sitt á netinu ættu að stilla "
-"<a href=\"/security-slider\">öryggisstillingasleða</a> Tor-vafrans á "
-"“Öruggara” (sem gerir JavaScript óvirkt á vefsvæðum sem ekki nota HTTPS) eða"
-" á “Öruggast” (sem lokar á JavaScript á öllum vefsvæðum). Hinsvegar, að gera"
-" JavaScript óvirkt mun valda því að margir vefir birtast ekki rétt, því er "
-"sjálfgefin stilling Tor-vafrans að leyfa öllum vefsvæðum að keyra skriftur í"
-" \"Staðlað\" hamnum."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2199,12 +2043,9 @@ msgstr "##### ER TENGINGIN ÞÍN RITSKOÐUÐ?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Ef þú getur samt ekki tengst, þá gæti netþjónustan þín verið að ritskoða "
-"tengingar við Tor-netkerfið. Lestu kaflann um <a "
-"href=\"/circumvention\">Hjáleiðir</a> til að finna hugsanlegar lausnir."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2215,14 +2056,9 @@ msgstr "##### ÞEKKT VANDAMÁL"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor-vafrinn er í stöðugri þróun, má gera ráð fyrir að sum vandamál séu þekkt"
-" en ekki sé búið að laga þau. Skoðaðu síðuna <a href=\"/known-issues\">Þekkt"
-" vandamál</a> til að sjá hvort vandamálin sem hrjá þig séu þegar tilgreind "
-"þar."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2319,12 +2155,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent er dæmi um hugbúnað þar sem umferð er <mark><a "
-"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">ekki"
-" nafnlaus í gegnum Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2338,50 +2171,118 @@ msgstr "Hvernig á að fjarlægja Tor-vafrann úr tölvunni"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Að fjarlægja Tor-vafrann úr tölvunni þinni er einfalt:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor-vafrinn hefur ekki áhrif á neitt af fyrirliggjandi hugbúnaði eða "
-"stillingum á tölvunni þinni. Að fjarlægja Tor-vafrann mun ekki breyta neinu "
-"varðandi hugbúnað eða stillingar kerfisins."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Að fjarlægja Tor-vafrann úr tölvunni þinni er einfalt:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Eyddu möppunni með Tor-vafranum eða forritinu."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Tæmdu ruslið"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Finndu möppu Tor-vafrans. Sjálfgefin staðsetning á Windows er "
-"Skjáborð/Desktop; á macOS er það Applications-mappan. Á Linux er engin "
-"sjálfgefin staðsetning, hinsvegar mun mappan heita \"tor-browser_en-US\" ef "
-"þú ert að keyra ensku útgáfuna af Tor-vafranum."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Eyddu möppu Tor-vafrans."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Tæmdu ruslið"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Athugaðu að venjulega \"Taka út forrit\" eining stýrikerfisins þíns er ekki "
-"notuð."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+it.po b/contents+it.po
index c73953422..03645fce8 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -3,19 +3,19 @@
 # Random_R, 2019
 # francesco ercolani <erco99 at live.it>, 2019
 # Lorenzo Mazza <lor.mazza81 at outlook.com>, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # Giandomenico Lombardi <transifex.com at l1t.it>, 2019
 # Davide Sant <spuuu at outlook.it>, 2019
 # Gabriele <gabboxl0 at gmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Gabriele <gabboxl0 at gmail.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,13 +197,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Per impostazione predefinita, il browser Tor non memorizza la cronologia dei"
-" siti web visitati. I cookie sono validi solo per la singola sessione di "
-"navigazione (fino a che non si chiude il Browser o <a href=\"/it/managing-"
-"identities/#nuova-identit\">è richiesta una Nuova identità</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -432,16 +428,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Nella maggior parte dei casi, scegliendo \"Connetti\" è possibile "
-"connettersi alla rete Tor senza ulteriori configurazioni. Una volta "
-"cliccato, apparirà una barra di stato che mostrerà l'avanzamento della "
-"connessione Tor. Se hai una connessione relativamente veloce, ma questa "
-"barra sembra bloccarsi a un certo punto, consulta la pagina <a "
-"href=\"troubleshooting\">Problemi</a>per assistenza."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -473,15 +462,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"La prima schermata vi chiederà se l'accesso alla rete Tor è bloccata o "
-"censurata sulla vostra linea. Se pensate che non sia il vostro caso cliccate"
-" su \"No\". Se non sapete se la vostra rete è censurata o avete provato a "
-"connettervi alla rete Tor senza successo e nessun altra soluzione ha "
-"funzionato cliccate su \"Sì\". Sarete portati allo schermata di <a "
-"href=\"circumvention\">Elusione</a>per configurare un pluggable transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -526,20 +509,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"La maggior parte dei <a href=\"transports\">pluggable transport</a>, come "
-"obfs3 e ofsf4, si basano su dei \"ponti\" relay. Come i nodi ordinari di Tor"
-" anche i ponti relay sono mantenuti da volontari; a differenza dei nodi "
-"ordinari, però, gli indirizzi dei ponti relay non sono pubblici. Per questo "
-"motivo un oppositore non può identificarli facilmente. La combinazione di "
-"nodi e pluggable transport aiuta a mascherare il fatto che si stia "
-"utilizzando la rete Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -709,8 +684,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -720,14 +695,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 fa sembrare il traffico di Tor casuale, in modo che non assomigli a "
-"Tor o a qualsiasi altro protocollo. Sebbene sia ancora incluso di default, "
-"si consiglia di usare obfs4, dato che ha diversi miglioramenti alla "
-"sicurezza rispetto a obfs3."
+"obfs4 rende casuale il traffico Tor come  obfs3, inoltre riesce a prevenire "
+"il ritrovamento dei ponti attraverso l'internet scanning. I ponti obfs4 sono"
+" piu' difficili da bloccare rispetto ai ponti obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -741,22 +715,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 rende casuale il traffico Tor come  obfs3, inoltre riesce a prevenire "
-"il ritrovamento dei ponti attraverso l'internet scanning. I ponti obfs4 sono"
-" piu' difficili da bloccare rispetto ai ponti obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -885,15 +843,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"L'accesso diretto alla rete Tor potrebbe essere bloccato dal tuo Provider di"
-" servizi Internet o dal governo. Il browser Tor include alcuni strumenti per"
-" superare questi ostacoli, chiamati \"pluggable transports\". Vai alla "
-"pagina <a href=\"/en-US/transports\">Pluggable Transports</a> per ulteriori "
-"informazioni riguardo ai tipi di trasporto attualmente disponibili."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -953,36 +905,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Ciascun trasporto riportato nel menu principale di Tor funziona in maniera "
-"differente ( per maggiori dettagli controlla la pagina <a href=\"/en-"
-"US/transports\">Pluggable transports</a>) e la loro efficacia dipende dalle "
-"diverse circostanze."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Se stai cercando di aggirare per la prima volta una connessione bloccata, "
-"dovresti provare i diversi trasporti: obfs3, obfs4, fte e meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Nel caso abbiate provato ad utilizzare tutti questi trasporti e nessuno di "
-"essi vi riesce a portare online dovrete inserire l'indirizzo del ponte "
-"manualmente. Leggete la sezione <a href=\"/en-US/bridges/\">ponti</a> per "
-"capire cosa sono i nodi e come ottenerli."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1083,18 +1023,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Nel circuito, il nodo Guard o entry è il primo nodo ed è selezionato "
-"automaticamente e casualmente da Tor. Ma è diverso dagli altri nodi nel "
-"circuito. Al fine di evitare attacchi di profilazione, il nodo Guard cambia "
-"solo dopo 2-3 mesi, a differenza degli altri nodi, che cambiano con ogni "
-"nuovo dominio. Per ulteriori informazioni sulle Guards, consultare le <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">domande "
-"frequenti</a> e il <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">portale di supporto</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1143,12 +1075,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Visita la pagina <a href=\"secure-connections\">Connessione sicura</a> per"
-" importanti informazioni su come rendere più sicura la tua connessione "
-"quando accedi."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1219,22 +1148,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Questa opzione è utile se <a href=\"about-tor-browser#how-tor-works\">l'exit"
-" relay</a> che stai utilizzando non è in grado di connettersi al sito web "
-"richiesto o non riesce a caricarlo correttamente. Selezionandolo, la scheda "
-"o la finestra attualmente attive verranno ricaricate su un nuovo circuito "
-"Tor. Altre schede aperte e finestre dello stesso sito Web utilizzeranno "
-"anch'esse il nuovo circuito una volta ricaricate. Questa opzione non "
-"cancella informazioni private o scollega la vostra attività, né influisce "
-"tantomeno sulle vostre attuali connessioni ad altri siti web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1286,13 +1207,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tutto il traffico attraverso gli utenti Tor ed il servizio onion sono "
-"crittografati con sistema end-to-end; per questo motivo non è necessario "
-"preoccuparsi del <a href=\"secure-connections\">connettersi attraverso "
-"HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1370,11 +1287,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Puoi anche assicurarti di poter accedere ai servizi Onion connettendoti al "
-"<a href=\"http://3g2upl4pq6kufc4m.onion/\">Servizio Onion DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1468,19 +1382,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1491,19 +1397,11 @@ msgstr "Sito.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1514,10 +1412,6 @@ msgstr "Il sito sta venendo visitato."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1567,10 +1461,6 @@ msgstr "Indipendentemente dal fatto che Tor venga utilizzato o meno."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1644,68 +1534,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Molto sicuro"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"A questo livello, i supporti audio e video HTML5 diventano click-to-play "
-"tramite NoScript. Tutte le ottimizzazioni delle prestazioni tramite "
-"JavaScript sono disabilitate. Alcune equazioni matematiche potrebbero non "
-"essere visualizzate correttamente. Alcune funzioni di rendering dei "
-"caratteri sono disabilitate. Alcuni tipi di immagine sono disabilitati. "
-"Javascript è disabilitato di default su tutti i siti così come sono "
-"disabilitati la maggior parte dei formati audio e video. Alcuni tipi di "
-"carattere ed alcune icone potrebbero non essere visualizzati correttamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Sicuro"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"A questo livello, i supporti audio e video HTML5 diventano click-to-play "
-"tramite NoScript. Tutte le ottimizzazioni delle prestazioni tramite "
-"JavaScript sono disabilitate. Alcune equazioni matematiche potrebbero non "
-"essere visualizzate correttamente. Alcune funzioni di rendering dei "
-"caratteri sono disabilitate. Alcuni tipi di immagine sono disabilitati. "
-"Javascript è disabilitato di default su tutti i siti non-<a href=\"secure-"
-"connections\">HTTPS</a>"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"A questo livello tutte le caratteristiche del browser sono attivate. Questa "
-"è l'opzione più comune."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1796,32 +1668,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1832,7 +1701,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1936,12 +1805,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Rimuovi il browser Tor dal tuo sistema cancellando la directory che lo "
-"contiene (guarda la sezione <a href='uninstalling'>Disinstalla</a> per "
-"maggiori informazioni)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2036,19 +1901,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Gli utenti che richiedono un alto livello di sicurezza durante la "
-"navigazione dovrebbero impostare il <a href=\"/security-slider\">Livello di "
-"sicurezza</a> a \"Sicuro\" (che disattiva JavaScript per i siti non-HTTPS) o"
-" \"Molto sicuro\" (che lo fa per tutti i siti). Tuttavia, disattivando "
-"JavaScript, alcuni siti potrebbero avere problemi di visualizzazione, per "
-"cui le impostazioni predefinite di Tor Browser permettono a tutti i siti di "
-"eseguire script in modalità \"Standard\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2170,12 +2028,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Se nonostante tutto non riuscite a connettervi, il vostro fornitore di "
-"servizi internet potrebbe aver bloccato le connessioni alla rete Tor. Visita"
-" la sezione <a href=\"circumvention\">Elusione</a>per possibili soluzioni."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2186,14 +2041,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Il Browser Tor è in continuo sviluppo, alcuni problemi sono conosciuti ma "
-"non ancora risolti. Per favore controlla la pagina <a href=\"known-"
-"issues\">Problemi conosciuti</a> per vedere se il problema che stai "
-"incontrando è già stato inserito nella pagina."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2291,12 +2141,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent nello specifico <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">non è reso anonimo tramite "
-"Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2310,51 +2157,118 @@ msgstr "Come rimuovere il browser Tor dal sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Disinstallare il browser Tor dal sistema è semplice:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Il browser Tor non modifica nessuna delle impostazioni del sistema o i "
-"programmi installati sul vostro PC. La disinstallazione del browser Tor non "
-"modificherà né le impostazioni di sistema né i programmi installati."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Disinstallare il browser Tor dal sistema è semplice:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Elimina la cartella o l'applicazione Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Svuota il cestino."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Trovare la cartella del browser Tor. La potete trovare sul Desktop se "
-"state utilizzando Windows, nella cartella Applicazioni se state utilizzando "
-"macOS.  Per Linux non esiste un percorso d'installazione predefinito; la "
-"cartella contenente il browser verrà nominata \"tor-browser_it-IT\" se state"
-" utilizzando la versione Italiana del Browser Tor."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Cancella la cartella Tor Browser."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Svuota il cestino"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Nota che l'applicazione standard per disinstallare i programmi non verrà "
-"utilizzata."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ja.po b/contents+ja.po
index c085cdaf7..599fa1d78 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -1,16 +1,16 @@
 # Translators:
 # erinm, 2019
-# Emma Peel, 2019
 # Tokumei Nanashi, 2019
 # 323484, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: 323484, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -185,11 +185,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"初期設定では、Tor Browser はいかなる閲覧履歴も保存しません。Cookie はひとつのセッション(Tor Browser が終了するか<a "
-"href=\"/managing-identities/#new-identity\">新しい識別子</a> が要求されるまで)だけで有効です。"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -385,9 +383,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -417,8 +414,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -456,12 +453,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -601,8 +597,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -612,9 +608,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -629,19 +625,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr ""
 
@@ -753,14 +736,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Tor ネットワークへの直接のアクセスがインターネットサービスプロバイダーや政府によってブロックされている場合があります。Tor Browser "
-"にはこうしたブロックを回避するためのツール群が含まれています。これらのツールは「Pluggable "
-"Transport」と呼ばれます。現在利用可能なトランスポートの種類についての情報は <a href=\"/en-"
-"US/transports\">Pluggable Transport</a> ページをご覧ください。"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -810,25 +788,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -904,9 +880,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -943,8 +919,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -999,13 +975,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1050,8 +1026,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1111,8 +1087,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1188,19 +1163,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1211,19 +1178,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1234,10 +1193,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1285,10 +1240,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1351,13 +1302,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "最も安全"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1369,31 +1320,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "より安全"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "標準"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1486,32 +1436,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1522,7 +1469,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1619,8 +1566,7 @@ msgstr "Tor Browser のアップデートを促されたら、セッションを
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1696,11 +1642,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1807,8 +1753,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1820,9 +1766,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1906,8 +1851,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1922,43 +1867,118 @@ msgstr "Tor Browser をシステムから取り除くには"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser はあなたのコンピュータのいかなる既存のソフトウェアおよび設定にも影響を及ぼしません。Tor Browser "
-"のアンインストールもソフトウェアおよび設定に影響を及ぼしません。"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Tor Browser フォルダーを削除します。"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* ごみ箱を空にします。"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "OS 標準の「アンインストール」ユーティリティーは使用しません。"
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ka.po b/contents+ka.po
index 0cbb2e5c4..16ae9e2cd 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Georgianization, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -193,12 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"ნაგულისხმევად, Tor-ბრაუზერი არ ინახავს მონახულებული გვერდების ისტორიას. "
-"ფუნთუშები მოქმედია მხოლოდ ერთი სეანსი (Tor-ბრაუზერის დახურვამდე ან <a href"
-"=\"/managing-identities/#new-identity\">ახალი ვინაობის</a> მოთხოვნამდე)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -424,16 +421,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"უმეტეს შემთხვევაში, „დაკავშირების“ ღილაკით ჩვეულებრივ მიიღებთ წვდომას Tor-"
-"ქსელთან, დამატებითი გამართვის გარეშე. როდესაც დააწკაპებთ, გამოჩნდება "
-"მდგომარეობის ზოლი, სადაც ნაჩვენები იქნება Tor-ის დაკავშირების მიმდინარეობა. "
-"თუ სწრაფი ინტერნეტი გაქვთ, მაგრამ ზოლი შევსებისას ერთ ადგილზე გაშეშდება, "
-"იხილეთ <a href=\"/troubleshooting\">გაუმართაობის აღმოფხვრის</a> გვერდი, "
-"ხარვეზის გამოსწორებისთვის დახმარების მისაღებად."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -465,15 +455,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"პირველ ფანჯარაში გამოჩნდება შეკითხვა, არის თუ არა Tor-ქსელთან კავშირი "
-"შეზღუდული ან ცენზურის ქვეშ. თუ ფიქრობთ რომ ასე არაა, აირჩიეთ „არა“. თუ იცით "
-"რომ თქვენი კავშირი ცენზურას ექვემდებარება ან სცადეთ დაკავშირება Tor-ქსელთან,"
-" მაგრამ ვერ მოხერხდა და ვერც სხვა გადაწყვეტებმა უშველა, აირჩიეთ „დიახ“. ამის"
-" შემდგომ, თქვენ გადამისამართდებით <a href=\"/circumvention\">გვერდის "
-"ავლის</a> ფანჯარაზე, მისაერთებელი გადამყვანების გასამართად."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -518,20 +502,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"<a href=\"/transports\">მისაერთებელი გადამყვანების</a> დიდი ნაწილი, მათ "
-"შორის obfs3 და obfs4, ეფუძნება „ხიდურ“ გადამცემებს. ჩვეულებრივი Tor-"
-"გადამცემების მსგავსად,  გადამცემი ხიდებიც მოხალისეების მიერაა "
-"უზრუნველყოფილი; თუმცა, განსხვავებით ჩვეულებრივი გადამცემებისა, ისინი არაა "
-"საჯაროდ აღნუსხული, ასე რომ, მოწინააღმდეგეები მარტივად ვერ მოახერხებენ მათ "
-"აღმოჩენას. ასეთი გადამცემების გამოყენება მისაერთებელ გადამყვანებთან ერთად, "
-"გამოსადეგია Tor-ით სარგებლობის შესანიღბად."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -703,8 +679,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -714,15 +690,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 აძლევს Tor-ით მიმოცვლილ მონაცემებს შემთხვევით სახეს, შედეგად აღარ "
-"ჩანს, რომ კავშირი ხდება Tor-ით ან სხვა რამე პროტოკოლით. მიუხედავად იმისა, "
-"რომ იგი ნაგულისხმევად ჯერ კიდევ გამოიყენება, მეტად სასურველია obfs4-ის "
-"გამოყენება მის ნაცვლად, რადგან გააჩნია უსაფრთხოების არაერთი სახის "
-"გაუმჯობესება, obfs3-სთან შედარებით."
+"obfs4 აძლევს Tor-ით მიმოცვლილ მონაცემებს შემთხვევით სახეს, obfs3-ის "
+"მსგავსად, და ამასთან არ აძლევს ცენზორებს საშუალებას მოიძიონ გადამცემი "
+"ხიდები, ინტერნეტის დასკანირებით. obfs4 გადამცემი ხიდების აღმოჩენა და "
+"შეზღუდვა ნაკლებად მოსალოდნელია, ვიდრე obfs3-ის გადამცემების."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -736,23 +711,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 აძლევს Tor-ით მიმოცვლილ მონაცემებს შემთხვევით სახეს, obfs3-ის "
-"მსგავსად, და ამასთან არ აძლევს ცენზორებს საშუალებას მოიძიონ გადამცემი "
-"ხიდები, ინტერნეტის დასკანირებით. obfs4 გადამცემი ხიდების აღმოჩენა და "
-"შეზღუდვა ნაკლებად მოსალოდნელია, ვიდრე obfs3-ის გადამცემების."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -883,16 +841,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Tor-ქსელთან პირდაპირი კავშირი ზოგჯერ შეზღუდულია ხოლმე ინტერნეტ-მომსახურების "
-"მომწოდებლის ან მთავრობის მიერ. Tor-ბრაუზერს გააჩნია გარკვეული სახის გვერდის "
-"ავლის საშუალებები, ამ შეზღუდვების ასარიდებლად. მათ ეწოდება „მისაერთებელი "
-"გადამყვანები“. იხილეთ გვერდი <a href=\"/en-US/transports\">მისაერთებელი "
-"გადამყვანები</a> დამატებითი ინფორმაციისთვის, თუ რა სახის გადამყვანებია "
-"ამჟამად ხელმისაწვდომი."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -952,36 +903,24 @@ msgstr "##### რომელი გადამყვანი უნდა გ
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Tor-ის გამშვების მენიუში მუშაობს მოცემული თითოეული გადამყვანი, "
-"სხვადასხვაგვარად (ვრცლად, იხილეთ <a href=\"/en-US/transports\">მისაერთებელი "
-"გადამყვანების</a> შესახებ გვერდი) და მათი შედეგიანობა დამოკიდებულია გვერდის "
-"ავლის თავისებურებებზე."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"თუ პირველად ცდილობთ შეზღუდული ქსელისთვის გვერდის ავლას, ჯობია მოსინჯოთ "
-"სხვადასხვა სახის გადამყვანები: obfs3, obfs4, fte, და meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"თუ ცდით ყველა მათგანს და ვერცერთი ვერ დაგაკავშირებთ ინტერნეტთან, დაგჭირდებათ"
-" გადამცემი ხიდის მისამართების ხელით მითითება. წაიკითხეთ <a href=\"/en-"
-"US/bridges/\">ხიდების</a> შესახებ განყოფილება და შეიტყვეთ, თუ რას "
-"წარმოადგენს ხიდები და როგორ ხდება მათი მოპოვება."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1080,18 +1019,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"წრედში, მცველი ანუ შემავალი წერტილი წარმოადგენს პირველ კვანძს, რომელსაც "
-"ავტომატურად და შემთხვევითობის საფუძველზე ირჩევს Tor. მაგრამ იგი გამოირჩევა "
-"წრედის დანარჩენი კვანძებისგან. მონაცემთა აღრიცხვით შეტევებისგან თავის "
-"ასარიდებლად, მცველი კვანძი იცვლება მხოლოდ 2-3 თვეში ერთხელ, განსხვავებით "
-"დანარჩენი კვანძებისგან, რომლებიც იცვლება საიტის ყოველი ახალი მისამართისთვის."
-" ვრცლად მცველი გადამცემების შესახებ, იხილეთ <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">ხ.დ.კ.</a> და <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">მხარდაჭერის საიტი</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1138,12 +1069,9 @@ msgstr "საიტზე Tor-ით შესვლისას, რამდ
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* იხილეთ <a href=\"/secure-connections\">დაცული კავშირების</a> გვერდი, "
-"მნიშვნელოვანი ინფორმაციის მისაღებად, თუ როგორ უნდა დაიცვათ თქვენი კავშირი "
-"ანგარიშზე შესვლისას."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1212,22 +1140,14 @@ msgstr "###### ახალი TOR-წრედი ახალი საიტ
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"ეს პარამეტრი გამოსადეგია მაშინ, როცა არსებული <a href=\"/about/#how-tor-"
-"works\">გამსვლელი წერტილით</a> ვერ ხერხდება საჭირო საიტთან დაკავშირება ან "
-"მისი სათანადოდ ჩატვირთვა. შედეგად, მოქმედი ჩანართი ან ფანჯარა ხელახლა "
-"ჩაიტვირთება ახალი Tor-წრედით. დანარჩენი ჩანართები და ფანჯრები, რომლებშიც "
-"იმავე საიტის სხვა გვერდებია გახსნილი, აგრეთვე ახალ წრედს გამოიყენებს, "
-"ხელახლა ჩატვირთვის შემდეგ. ამ შემთხვევაში, პირადი მონაცემები არ წაიშლება და "
-"არც თქვენი მოქმედებების განცალკევება არ მოხდება, ასევე ეს ყველაფერი არ "
-"იმოქმედებს თქვენს კავშირზე სხვა საიტებთან."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1280,12 +1200,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* მიმოცვლილი მონაცემები Tor-ის მომხმარებლებსა და Onion-მომსახურებებს შორის "
-"დაცულია პირდაპირი დაშიფვრით, ასე რომ შეგიძლიათ არ იდარდოთ <a href=\"/secure-"
-"connections\">HTTPS-ით დაკავშირებაზე</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1363,12 +1280,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"ამასთან, Onion-მომსახურებებთან წვდომის შესაძლებლობა შეგიძლიათ გადაამოწმოთ <a"
-" href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo-ს Onion-"
-"მომსახურებასთან</a> დაკავშირების მეშვეობით."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1462,19 +1375,11 @@ msgstr "##### შესაძლო ხილული მონაცემე
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1485,19 +1390,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1508,10 +1405,6 @@ msgstr "მონახულებული საიტი."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1561,10 +1454,6 @@ msgstr "გამოყენებულია თუ არა Tor."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1636,66 +1525,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "სრულიად დაცული"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"მოცემულ დონეზე, HTML5-ის ვიდეო და ხმოვანი ფაილები გაეშვება მხოლოდ "
-"დაწკაპებით, NoScript-ის საშუალებით; JavaScript-ის წარმადობის ყველანაირი "
-"გაუმჯობესება გათიშულია; მათემატიკური გამოთვლების ნაწილი, შესაძლოა "
-"არასათანადოდ გამოჩნდეს; ზოგიერთი შრიფტის გამოსახვა შეზღუდულია; სურათების "
-"ნაწილი გათიშულია; JavaScript ნაგულისხმევად გამორთულია ყველა საიტზე; "
-"ვიდეოებისა და ხმოვანი ფაილების ფორმატები შეზღუდულია; აგრეთვე, შრიფტებისა და "
-"ხატულების ნაწილი, შესაძლოა არ გამოჩნდეს გამართულად."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "მეტად დაცული"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"მოცემულ დონეზე, HTML5-ის ვიდეო და ხმოვანი ფაილები გაეშვება მხოლოდ "
-"დაწკაპებით, NoScript-ის საშუალებით; JavaScript-ის წარმადობის ყველანაირი "
-"გაუმჯობესება გათიშულია; მათემატიკური გამოთვლების ნაწილი, შესაძლოა "
-"არასათანადოდ გამოჩნდეს; ზოგიერთი შრიფტის გამოსახვა შეზღუდულია; სურათების "
-"ნაწილი გათიშულია; JavaScript ნაგულისხმევად გამორთულია ყველა <a href"
-"=\"/secure-connections\">HTTPS</a>-ის არმქონე საიტზე."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "ჩვეულებრივი"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"მოცემულ დონეზე, ბრაუზერის ყველა შესაძლებლობა ჩართულია. ესაა ყველაზე მეტად "
-"მოსახერხებელი გამოსაყენებლად."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1809,40 +1682,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"მოცემული დონისთვის, Tor-ბრაუზერისა და ვებსაიტების შესაძლებლობები ჩართულია."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"ეს დონე გათიშავს საიტის იმ შესაძლებლობებს, რომლებიც მეტად საფრთხისშემცველია."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "სავარაუდოდ საიტების ნაწილი ვერ იმუშავებს გამართულად."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript გათიშულია <a href=\"/secure-connections\">HTTPS</a>-ს არმქონე "
-"ყველა საიტზე; შრიფტებისა და მათემატიკური სიმბოლოების ნაწილი გათიშულია; "
-"ვიდეოები და ხმოვანი ფაილები (HTML5-ფორმატის) ეშვება დაწკაპებით."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"ამ დონეზე დაშვებულია მხოლოდ ის შესაძლებლობები, რომლებსაც საჭიროებს უცვლელი "
-"შიგთავსის მქონე საიტები და ძირითადი მომსახურებები."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1852,13 +1715,10 @@ msgstr "ცვლილებები შეეხება სურათე
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript ნაგულისხმევად გათიშულია ყველა საიტზე; შრიფტების, მათემატიკური "
-"სიმბოლოებისა და სურათების ნაწილი გათიშულია; ვიდეოები და ხმოვანი ფაილები "
-"(HTML5-ფორმატის) ეშვება დაწკაპებით."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1960,11 +1820,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"ამოშალეთ Tor-ბრაუზერი სისტემიდან, მისი საქაღალდის წაშლით (იხილეთ განყოფილება"
-" <a href='uninstalling'>ამოშლა</a>, დამატებითი ინფორმაციისთვის)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2060,19 +1917,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"მომხმარებლები, რომლებიც მაღალი ხარისხის უსაფრთხოებას საჭიროებენ ვებგვერდების"
-" მონახულებისას, Tor-ბრაუზერის <a href=\"/security-slider\">უსაფრთხოების "
-"რბია</a> აუცილებლად უნდა დააყენონ „მეტად დაცულზე“ (რომელიც გათიშავს "
-"JavaScript-ს HTTPS-ს არმქონე საიტებზე) ან „სრულიად დაცულზე“ (რომელიც იმავეს "
-"გააკეთებს ყველა ვებსაიტზე). თუმცა, JavaScript-ის გათიშვა ხელს შეუშლის "
-"საიტების გამართულად მუშაობას, ასე რომ Tor-ბრაუზერში ნაგულისხმევად დაშვებულია"
-" ყველა საიტზე სკრიპტების გაშვება „ჩვეულებრივ“ რეჟიმში."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2191,13 +2041,9 @@ msgstr "##### თქვენი ქსელის ცენზურის ქ
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"თუ ჯერ კიდევ ვერ ახერხებთ დაკავშირებას, შესაძლოა თქვენი ინტერნეტ-"
-"მომსახურების მომწოდებელი ზღუდავდეს Tor-ქსელთან კავშირს. გაეცანით <a "
-"href=\"/circumvention\">გვერდის ავლის</a> განყოფილებას, შესაძლო "
-"გადაწყვეტების სანახავად."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2208,14 +2054,9 @@ msgstr "##### ცნობილი ხარვეზები"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor-ბრაუზერი მუდმივად მუშავდება და ცნობილია ზოგიერთი ხარვეზი, რომელიც ჯერ "
-"არაა მოგვარებული. გთხოვთ, გაეცნოთ <a href=\"/known-issues\">ცნობილი "
-"ხარვეზების</a> გვერდს და ნახოთ, თქვენ მიერ აღმოჩენილი ხარვეზი, უკვე "
-"აღრიცხულია თუ არა მოცემულ ჩამონათვალში."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2316,12 +2157,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* ვრცლად, გთხოვთ გაეცნოთ ჩვენს <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">სვეტზე სტატიას მოცემულ "
-"თემაზე</a></mark>"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2335,50 +2173,118 @@ msgstr "როგორ ხდება Tor-ბრაუზერის სი
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Tor-ბრაუზერის სისტემიდან ამოშლა მარტივია:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor-ბრაუზერი არ ზემოქმედებს დანარჩენ პროგრამებზე ან თქვენი კომპიუტერის "
-"პარამეტრებზე. ასე რომ, მისი ამოშლა არ მოახდენს გავლენას სხვა პროგრამებსა და "
-"პარამეტრებზე თქვენს სისტემაში."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Tor-ბრაუზერის სისტემიდან ამოშლა მარტივია:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* წაშალეთ Tor-ბრაუზერის საქაღალდე."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* გაასუფთავეთ სანაგვე ურნა."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
-"1. მონახეთ თქვენი Tor-ბრაუზერის საქაღალდე. ნაგულისხმევი მდებარეობა Windows-"
-"ზე არის მთავარი სამუშაო ეკრანი (Desktop); macOS-ზე იქნება პროგრამების "
-"საქაღალდე. Linux-ზე არ არსებობს ასეთი მდებარეობა, თუმცა წესით უნდა იყოს "
-"საქაღალდეში დასახელებით „tor-browser_en-US“, ინგლისური ვერსიის შემთხვევაში."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. წაშალეთ Tor-ბრაუზერის საქაღალდე."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. გაასუფთავეთ სანაგვე ურნა"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"გაითვალისწინეთ, რომ თქვენი სისტემის „პროგრამების ამოშლის“ ჩვეულებრივი "
-"ხელსაწყო არ გამოიყენება."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ko.po b/contents+ko.po
index d1efa014e..54bd71526 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -1,17 +1,16 @@
 # Translators:
-# Philipp Sauter <qt123 at pm.me>, 2018
-# erinm, 2019
 # Johnny Cho <popeye92 at gmail.com>, 2019
 # Emma Peel, 2019
 # park seungbin <parksengbin48 at gmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: park seungbin <parksengbin48 at gmail.com>, 2019\n"
+"Last-Translator: erinm, 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"
@@ -188,11 +187,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"기본적으로 Tor 브라우저는 인터넷 사용 기록을 유지하지 않습니다. 쿠키는 단일 세션 에서만 유효합니다. (Tor 브라우저가 종료되거나 "
-"<a href=\"/managing-identities/#new-identity\">새로운 신원</a>이 요청 될 때까지)"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -384,9 +381,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -416,8 +412,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -455,12 +451,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -600,8 +595,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -611,9 +606,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -628,19 +623,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr ""
 
@@ -752,9 +734,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -805,25 +786,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -899,9 +878,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -938,8 +917,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -994,13 +973,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1045,8 +1024,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1106,8 +1085,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1183,19 +1161,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1206,19 +1176,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1229,10 +1191,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1280,10 +1238,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1346,13 +1300,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "제일 안전합니다"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1364,31 +1318,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "더 안전합니다"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "표준"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1481,32 +1434,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1517,7 +1467,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1606,8 +1556,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1683,11 +1632,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1786,8 +1735,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1799,9 +1748,8 @@ msgstr "##### 알려진 이슈"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1885,8 +1833,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1901,40 +1849,117 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "시스템에서 Tor 브라우저를 제거하는 방법은 간단합니다:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "시스템에서 Tor 브라우저를 제거하는 방법은 간단합니다:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Tor 브라우저의 폴더 또는 응용 프로그램을 삭제하십시오."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* 휴지통 폴더를 비우십시오."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Tor 브라우저의 폴더를 삭제하십시오."
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. 휴지통 폴더를 비우십시오."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
diff --git a/contents+lt.po b/contents+lt.po
index 1975f271e..3e3c71f2b 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Benas Buivydas <benas at perfitect.net>, 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
@@ -192,13 +192,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Pagal numatymą, Tor Naršyklė nesaugo jokios naršymo istorijos. Slapukai "
-"galioja tik vienam seansui (kol nėra išeinama iš Tor Naršyklės arba nėra "
-"paprašoma <a href=\"/managing-identities/#new-identity\">Naujos "
-"tapatybės</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -422,9 +418,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -454,8 +449,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -493,12 +488,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -640,8 +634,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -651,9 +645,9 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -668,19 +662,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr ""
 
@@ -792,9 +773,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -845,25 +825,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -939,9 +917,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -978,8 +956,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1034,13 +1012,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1085,8 +1063,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1146,8 +1124,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1224,19 +1201,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1247,19 +1216,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1270,10 +1231,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1321,10 +1278,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1387,13 +1340,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Saugiausias"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1405,31 +1358,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Saugesnis"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standartinis"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1522,32 +1474,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1558,7 +1507,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1647,8 +1596,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1727,11 +1675,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1830,8 +1778,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1843,9 +1791,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1931,8 +1878,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1947,40 +1894,117 @@ msgstr "Kaip pašalinti Tor Browser iš savo sistemos"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Ištrinkite Tor Browser aplanką."
+msgid "On Linux:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Išvalykite savo šiukšlinę"
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
diff --git a/contents+lv.po b/contents+lv.po
index b3b9a0366..377466893 100644
--- a/contents+lv.po
+++ b/contents+lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
@@ -183,8 +183,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -384,9 +384,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -418,8 +417,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -462,12 +461,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -616,8 +614,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -627,10 +625,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"Līdzīgi kā obfs3 obfs4 padara Tor datu plūsmu pēc izskata līdzīgu nejauši "
+"izvēlētai un novērš, ka cenzori ar interneta skenēšanas palīdzību atrod "
+"tiltus. Ir ticami, ka obfs4 tiltus bloķēs mazāk par obfs3 tiltiem."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -644,22 +645,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"Līdzīgi kā obfs3 obfs4 padara Tor datu plūsmu pēc izskata līdzīgu nejauši "
-"izvēlētai un novērš, ka cenzori ar interneta skenēšanas palīdzību atrod "
-"tiltus. Ir ticami, ka obfs4 tiltus bloķēs mazāk par obfs3 tiltiem."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -771,9 +756,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -824,25 +808,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -936,9 +918,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -987,8 +969,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1050,13 +1032,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1105,8 +1087,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1170,8 +1152,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1254,19 +1235,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1277,19 +1250,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1300,10 +1265,6 @@ msgstr "Vietne tiek apmeklēta."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1353,10 +1314,6 @@ msgstr "Vai Tor tiek vai netiek izmantots."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1426,59 +1383,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Drošākais"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Šajā līmenī ar NoScript maina HTML5 video un audio vidi par noklikšķināt-"
-"lai-spēlētu; tiek atspējotas visas JavaScript veiktspējas optimizācijas, "
-"dažas matemātiskas vienādības var netikt attēlotas pareizi; dažas fontu "
-"attēlošanas iezīmes ir atspējotas; daži attēlu veidi ir atspējoti; pēc "
-"noklusējuma visās vietnēs ir atspējots Javscript; vairums video un audio "
-"formātu ir atspējoti un daži fonti un ikonas var netikt attēloti pareizi. "
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Drošāk"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standarts"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Šajā līmenī ir iespējotas visas pārlūka iezīmes. Šī ir vispiemērotāka "
-"opcija."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1569,32 +1517,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1605,7 +1550,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1709,8 +1654,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1799,11 +1743,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1915,8 +1859,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1928,9 +1872,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2029,8 +1972,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2045,46 +1988,118 @@ msgstr "Kā no Jūsu sistēmas noņemt pārlūku Tor"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Pārlūks Tor nemaina uz Jūsu datora esošo programmatūru vai iestatījumus. "
-"Pārlūka Tor atinstalēšana neietekmēs Jūsu sistēmas programmatūru vai "
-"iestatījumus. "
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Izdzēst pārlūka Tor mapi."
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Iztukšojiet savu atkritni"
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Ievērojiet, ka netiek lietota Jūsu operētājsistēmas standarta utilīta "
-"„Atinstalēt”."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+mk.po b/contents+mk.po
index 0d951897b..6c39938c0 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Liljana Ackovska <liljanagjurova at gmail.com>, 2019\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
@@ -195,13 +195,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Стандардно, Tor Browser не задржува никаква историја од вашето прелистување."
-" Колачињата се валидни само за време на сесијата (додека не го исклучите Tor"
-" Browser или не побарате <a href=\"/mk/managing-identities.html#new-"
-"identity\">Нов Идентитет</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -426,16 +422,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Во најголем дел од случаите, одбирањето „Поврзи“ ќе ви дозволи да се "
-"поврзете на Tor мрежата без понатамошни измени на поставките. Кога ќе "
-"кликнете, статусна линија ќе се појави, покажувајќи го процесот на Tor "
-"поврзување. Ако имате брзо поврзување, а процесот ви изгледа заглавен на "
-"конкретен момент, погледнете во <a href=\"/troubleshooting\">Проблеми</a> "
-"страната за помош за решавање на проблемот."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -467,16 +456,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Првиот екран прашува дали пристапот до Tor мрежата е блокиран или цензуриран"
-" на вашето поврзување. Ако не верувате дека ова е случајот одберете „Не“. "
-"Ако знаете дека поврзувањето ви е цензурирано, или доколку пробавте и не "
-"успеавте да се поврзете на Tor мрежата, и ниту едно друго решение не "
-"работеше, одберете „Да“. Тогаш ќе бидете префрлени на <a "
-"href=\"/circumvention\">Заобиколување</a> екранот за конфигурирање на "
-"pluggable transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -521,19 +503,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Повеќето од <a href=\"/transports\">Pluggable Transports</a> , како obfs3 и "
-"obfs4, се потпираат на користење на „мостни / премостувачки“ релеа. За "
-"разлика од обичните Tor релеа, овие не се излистани јавно, со што спротивно "
-"на другите овие не можат да бидат лесно идентификувани. Користењето на "
-"мостови во комбинација со pluggable transports помагаат во маскирањето на "
-"фактот дека користите Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -691,8 +666,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -702,14 +677,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 го прави Tor сообраќајот да изгледа како да е по случаен избор, па "
-"така тој не изгледа како Tor или некој друг протокол. Иако е сеуште "
-"стандардно вклучен, наместо obfs3, се препорачува користење на obfs4, "
-"бидејќи има неколку безбедносни подобрувања во однос на obfs3."
+"obfs4 прави Tor сообраќајот да изгледа како да е по случаен избор како и "
+"obfs3, и исто така спречува цензурирачите да ги најдат мостовите со "
+"скенирање на Интернетот. obfs4 мостовите е помалку веројатно да бидат "
+"блокирани отколку obfs3 мостовите."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -723,23 +698,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 прави Tor сообраќајот да изгледа како да е по случаен избор како и "
-"obfs3, и исто така спречува цензурирачите да ги најдат мостовите со "
-"скенирање на Интернетот. obfs4 мостовите е помалку веројатно да бидат "
-"блокирани отколку obfs3 мостовите."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -855,17 +813,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
-msgstr ""
-"Директниот пристап до Tor мрежата може понекогаш да биде блокиран од вашиот "
-"Интернет сервис провајдер или од Владата. Tor Browser вклучува некои "
-"заобиколувачки алатки за да ги заобиколите овие блокади. Овие алатки се "
-"наречени „pluggable transports“ што во превод значи „приклучни "
-"транспортери“. Погледнете ја <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> страницата за повеќе информации кои типови на транспорт се "
-"моментално возможни."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
+msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -915,34 +865,24 @@ msgstr "##### Кој транспорт треба да го користам?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Секој од транспортите излистан во Tor Launcher менито работи на различен "
-"начин (за повеќе детали, видете <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> страната), и нивниот ефект зависи конкретно од вашите "
-"околности."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Ако се обидовте со сите овие опции, и со ниту една не се поврзавте онлајн, "
-"треба рачно да внесете мост адреси. Прочитајте за <a href=\"/en-"
-"US/bridges/\">Мостови</a> секцијата и научете што се мостови и како да ги "
-"добиете."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1040,9 +980,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1093,12 +1033,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Видете ја <a href=\"/secure-connections\">Безбедни Поврзувања</a> страната"
-" за важни информации за тоа како да го обезбедите вашето поврзување кога се "
-"најавувате."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1166,22 +1103,14 @@ msgstr "###### Нов Тор круг за оваа страна"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Оваа е опција е корисна ако <a href=\"/about/#how-tor-works\">излесното "
-"реле</a> кое го користите не може да се поврзе на веб страната која ја "
-"барате, или не се вчитува правилно. Одбирајќи го ова ќе направи моментално-"
-"активниот таб или прозорец да биде повторно вчитан преку нов Tor круг. "
-"Другите отворени табови и прозорци од истата веб страна ќе го користат "
-"новиот круг откако ќе бидат и тие повторно вчитани. Оваа опција не чисти "
-"ниту една приватна информација или ги прекинува врските на вашата активност,"
-" ниту пак влијае на вашето моментално поврзување со друга веб страна."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1232,12 +1161,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Целиот сообраќај помеѓу Tor Browser и onion услугите е од-крај-до-крај "
-"енкриптирано, па не треба да се грижите за <a href=\"/secure-"
-"connections\">поврзувањето преку HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1310,12 +1236,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Исто така осигурајте се дека сте во можност да да и пристапите на onion "
-"услугата со поврзување на <a "
-"href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion услугата</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1411,19 +1333,11 @@ msgstr "##### Можни видливи податоци"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1434,19 +1348,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1457,10 +1363,6 @@ msgstr "Веб страната е посетена."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1510,10 +1412,6 @@ msgstr "Дали Tor е користен или не."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1587,66 +1485,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Најбезбедно"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"На ова ниво, HTML5 видео и аудио медијата стануваат кликни-за-да-пуштиш "
-"преку NoScript; сите JavaScript оптимизации на перформансите се "
-"оневозможени; некои математички равенки може да не се вчитаат правилно; "
-"некои карактеристики за рендерирање фонтови се оневозможени; некои типови на"
-" слики се оневозможени; JavaScript е стандардно оневозможена на сите веб "
-"страни; повеќето видео и аудио формати се оневозможени; и некои фонтови и "
-"икони може да не бидат прикажани правилно."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Побезбедно"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"На ова ниво, HTML5 видео или аудио медијата стануваат кликни-за-да-пуштиш "
-"преку NoScript; сите JavaScript перформанси за оптимизации се исклучени; "
-"некои математички равенки може да не се прикажуваат правилно; некои "
-"карактеристики за рендерања на фонт се оневозможени; некои видови на слики "
-"се оневозможени; и JavaScript е стандардно оневозможена на сите не-<a href"
-"=\"/secure-connections\">HTTPS</a> веб страни."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Стандардно"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"На ова ниво, сите карактеристики на прелистувачот се оневозможени. Ова е "
-"најкористената опција."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1741,34 +1623,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Ова може да предизвика некој веб страни да ја изгубат својата "
-"функционалност."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1779,7 +1656,7 @@ msgstr "Овие промени може да влијаат на слики, м
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1883,12 +1760,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Отстранете го Tor Browser од вашиот систем со бришење на папката која го "
-"содржи (видете ја <a href='uninstalling'>Деинсталирање</a> секцијата за "
-"повеќе информации)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1978,19 +1851,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Корсиниците кои бараат висок степен на сигурност за нивното веб пребарување "
-"треба да го постават Tor Browser <a href=\"/security-slider\">Безбедносниот "
-"Лизгач</a> на \"Побезбедно\" (кој што ја оневозможува JavaScript за не-HTTPS"
-" веб страните) или на \"Најбезбедно\" (кој го прави ова за сите веб страни)."
-" Како и да е, оневозможувањето на JavaScript ќе спречи многу од веб страните"
-" да се прикажат правилно, па Tor Browser стандардната поставка ќе овозможи "
-"сите веб страни да стартуваат скрипти на мод \"Стандардно\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2114,12 +1980,9 @@ msgstr "##### Дали вашето поврзување е цензуриран
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Ако сеуште не можете да се поврзете, вашиот Интернет Сервис Провајдер можно "
-"е да го цензурира поврзувањето на Tor  мрежата. Прочитајте ја <a "
-"href=\"/circumvention\">Заобиколување</a> секцијата за можни решенија."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2130,14 +1993,9 @@ msgstr "##### Познати проблеми"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser е под постојано развивање, и некои проблеми се познати но сеуште"
-" не се поправени. Ве молиме проверете на <a href=\"/known-issues\">Познати "
-"Проблеми</a> страницата да видите дали проблемот со кој се соочувате е веќе "
-"излистан таму."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2235,8 +2093,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2251,46 +2109,118 @@ msgstr "Како да го отстаните Tor Browser од вашиот си
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Отстранувањето на Tor Browser од вашиот систем е едноствано:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser не влијае врз постоечкиот софтвер или поставките на вашиот "
-"компјутер. Деинсталирањето на Tor Browser нема да му наштети на вашиот "
-"системски софтвер или на вашите поставки. "
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Отстранувањето на Tor Browser од вашиот систем е едноствано:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Избришете ја Tor Browser папката."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Испразнете го Ѓубрето"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Забележете дека вашата стандардна \"Деинсталирај\" алатка во вашиот "
-"оперативен систем не е користена."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ms.po b/contents+ms.po
index f8272b149..d1465265d 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-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: abuyop <abuyop at gmail.com>, 2019\n"
 "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -191,12 +191,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Secara lalai, Pelayar Tor tidak menyimpan apa-jua sejarah pelayaran. Kuki "
-"hanya sah untuk satu sesi (sehinggalah Pelayar Tor ditutup atau satu <a href"
-"=\"/managing-identities/#new-identity\">Identiti Baharu</a> dipohon)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -419,16 +416,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Dalam kebanyakan situasi, memilih \"Sambung\" akan terus menyambung ke "
-"rangkaian Tor tanpa apa-apa konfigurasi. Selepas diklik, satu palang status "
-"akan muncul, menunjukkan kemajuan sambungan Tor. Jika anda menggunakan "
-"sambungan pantas, palang ini seakan-akan tersekat pada satu tempat, sila "
-"rujuk halaman <a href=\"/troubleshooting\">Pencarisilapan</a> untuk "
-"penyelesaian masalah tersebut."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -460,16 +450,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Skrin pertama menanya sama ada capaian ke rangkaian Tor disekat atau "
-"ditapis. Jika anda tidak tahu atau tidak pasti, pilih \"No\". Jika anda "
-"pasti sambungan anda telah ditapis, atau anda telah cuba beberapa kali dan "
-"masih gagal bersambung dengan rangkaian Tor dan beberapa penyelesaian lain "
-"juga gagal, pilihlah \"Ya\". Anda akan diarah ke skrin <a "
-"href=\"/circumvention\">Pemintasan</a> untuk mengkonfigur satu angkutan "
-"boleh palam."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -514,19 +497,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Kebanyakan <a href=\"/transports\">Angkutan Boleh Palam</a>, seperti obfs3 "
-"dan obfs4, bergantung kepada penggunaan geganti \"titi\". Seperti geganti-"
-"genganti Tor biasa, titi dijalankan oleh para sukarela; tidak seperti "
-"geganti biasa, ia tidak tersenarai secara umum, jadi pihak musuh  tidak "
-"dapat mengecamnya dengan mudah. Penggunaan titi bersama-sama dengan angkutan"
-" boleh palam dapat membantu penyamaran anda sedang menggunakan Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -696,8 +672,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -707,14 +683,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 merawakkan trafik Tor, supaya ia tidak menyerupai Tor atau mana-mana "
-"protokol lain. Walaupun disertakan secara lalai, adalah disarankan "
-"menggunakan obfs4 sebagai ganti, kerana yang terkini mempunyai beberapa "
-"penambahbaikan keselamatan berbanding obfs3."
+"obfs4 juga merawakkan trafik Tor seperti obfs3, dan menghalang penapisan "
+"daripada titi-titi yang ditemui oleh pengimbasan Internet. Titi-titi obfs4 "
+"lebih sukar disekat berbanding titi-titi obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -728,22 +703,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 juga merawakkan trafik Tor seperti obfs3, dan menghalang penapisan "
-"daripada titi-titi yang ditemui oleh pengimbasan Internet. Titi-titi obfs4 "
-"lebih sukar disekat berbanding titi-titi obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -873,16 +832,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Capaian terus ke rangkaian Tor mungkin disekat oleh Penyedia Perkhidmatan "
-"Internet anda atau pihak kerajaan. Pelayar Tor menyediakan beberapa alatan "
-"pemintasan untuk menghindari sekatan ini. Alatan ini dikenali sebagai "
-"\"angkutan boleh palam\". Sila rujuk halaman <a href=\"/en-"
-"US/transports\">Halaman Boleh Palam</a> untuk maklumat lanjut berkenaan "
-"jenis-jenis angkutan yang tersedia."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -941,36 +893,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Setiap angkutan yang disenarai dalam menu Pelancar Tor berfungsi dengan cara"
-" tersendiri (maklumat lanjut, sila rujuk halaman <a href=\"/en-"
-"US/transports\">Angkutan Boleh Palam</a>), dan keberkesanan mereka "
-"bergantung kepada keadaan anda."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Jika anda cuba memintas satu sambungan disekat buat kali pertama, anda patut"
-" cuba angkutan yang lain: obfs3, obfs4, fte, dan meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Jika anda telah cuba kesemua pilihan ini, dan tiada satu pun berjaya, anda "
-"perlu masukkan alamat-alamat titi secara manual. Baca seksyen <a href=\"/en-"
-"US/bridges/\">Titi</a> untuk ketahui apa itu titi dan bagaimana hendak "
-"mendapatkannya."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1070,17 +1010,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Dalam litar, Pengawal atau nod masukan ialah nod pertama dan ia dipilih "
-"secara automatik dan rawak oleh Tor. Tetapi ia berbeza bagi nod lain di "
-"dalam litar. Untuk menghindari serangan profil, nod Pengawal hanya berubah "
-"selepas 2-3 bulan, tidak seperti lain-lain nod, yang berubah sekiranya "
-"berada dalam domain baharu. Maklumat lanjut berkenaan Pengawal, rujuk <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> dan <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Portal Sokongan</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1129,12 +1062,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Lihat halaman <a href=\"/secure-connections\">Sambungan Selamat</a> untuk "
-"maklumat penting, bagaimana hendak kukuhkan keselamatan sambungan ketika "
-"mendaftar masuk."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1203,23 +1133,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Pilihan ini berguna sekiranya <a href=\"/about/#how-tor-works\">geganti "
-"keluar</a> yang anda guna tidak berupaya menyambung ke laman sesawang yang "
-"dikehendaki, atau tidak dimuatkan dengan baik. Memilihnya akan menyebabkan "
-"tab atau tetingkap aktif-semasa dimuat semula dengan litar Tor baharu.  "
-"Lain-lain tab dan tetingkap daripada laman sesawang yang sama akan "
-"menggunakan litar baharu sebaik ia dimuatkan semula. Pilihan ini tidak "
-"mengosongkan apa-apa maklumat peribadi atau menyahpaut aktiviti anda, juga "
-"tidak memberi kesan terhadap sambungan semasa anda dengan laman sesawang "
-"lain."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1272,12 +1193,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Semua trafik antara para pengguna Tor dengan perkhidmatan onion adalah "
-"disulitkan dari awal hingga akhir, jadi anda tidak perlu risau berkenaan <a "
-"href=\"/secure-connections\">penyambungan terhadap HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1356,12 +1274,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Anda boleh memastikan dapat mencapai lain-lain perkhidmatan onion dengan "
-"menyambung ke <a href=\"http://3g2upl4pq6kufc4m.onion/\">Perkhidmatan Onion "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1458,19 +1372,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1481,19 +1387,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1504,10 +1402,6 @@ msgstr "Laman telah dilawati."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1557,10 +1451,6 @@ msgstr "Sama ada ia atau tidak Tor digunakan."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1635,65 +1525,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Paling Selamat"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Pada tahap ini, media video dan audio HTML5 menjadi klik-untuk-dimainkan "
-"melalui NoScript; semua pengoptimuman prestasi Skrip Java dilumpuhkan; "
-"sesetengah pengiraan bermatematik tidak dipaparkan dengan baik; sesetengah "
-"fitur penerapan fon dilumpuhkan; sebahagian jenis imej dilumpuhkan; skrip "
-"Java dilumpuhkan secara lalai pada semua laman sesawang; kebanyakan format "
-"video dan audio dilumpuhkan; dan sesetengah fon dan ikon tidak dapat "
-"dipaaprkan dengan baik."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Lebih Selamat"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Pada tahap ini, media video dan audio HTML5 menjadi klik-untuk-dimainkan "
-"melalui NoScript; semua pengoptimuman prestasi Skrip Java dilumpuhkan; "
-"sesetengah pengiraan bermatematik tidak dipaparkan dengan baik; sesetengah "
-"fitur penerapan fon dilumpuhkan; dan Skrip Java dilumpuhkan secara lalai "
-"pada semua laman sesawang bukan-<a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Piawai"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Pada tahap ini, semua fitur pelayar dibenarkan. Ini adalah pilihan yang "
-"banyak digunakan."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1784,32 +1659,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1820,7 +1692,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1924,12 +1796,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Buang Pelayar Tor dalam sistem anda dengan memadam folder yang dikandunginya"
-" (silar rujuk seksyen <a href='uninstalling'>Menyahpasang</a> untuk maklumat"
-" lanjut)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2023,20 +1891,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Pengguna yang mahu keselamatan tahap tinggi ketika melayari sesawang boleh "
-"tetapkan <a href=\"/security-slider\">Pelungsur Keselamatan</a> ke tahap "
-"\"Lebih Selamat\" (yang dapat melumpuhkan Skrip Java untuk laman sesawang "
-"bukan-HTTPS) atau \"Paling Selamat\" (yang bertindak kepada semua laman "
-"sesawang yang ada). Namun begitu, melumpuhkan Skrip Java akan menghalang "
-"banyak laman sesawang dipaparkan dengan betul, jadi tetapan lalai Pelayar "
-"Tor membenarkan semua laman sesawang menjalankan skripnya dalam mod "
-"\"Piawai\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2160,12 +2020,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Jika anda masih gagal bersambung, Penyedia Perkhidmatan Internet anda "
-"mungkin telah menyekat sambungan ke rangkaian Tor. Sila rujuk seksyen <a "
-"href=\"/circumvention\">Pemintasan</a> untuk  mendapatkan penyelesaian lain."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2176,14 +2033,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Pelayar Tor sentiasa dalam proses pembangunan, dan terdapat beberapa masalah"
-" timbul yang dikenal pasti tetapi tidak sempat dibaiki. Sila periksa <a href"
-"=\"/known-issues\">Masalah-masalah Diketahui untuk mengetahui sama ada "
-"masalah yang anda hadapi sudah tercatat dalam senarai tersebut."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2281,12 +2133,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent sebenarnya <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">tidak diawanama menerusi "
-"Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2300,46 +2149,118 @@ msgstr "Bagaimana hendak membuang Pelayar Tor daripada sistem anda"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Membuang Pelayar Tor daripada sistem anda adalah mudah:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Pelayar Tor tidak memberi kesan kepada mana-mana perisian atau tetapan sedia"
-" ada komputer anda. Pembuangan Pelayar Tor juga tidak mempengaruhi perisian "
-"atau tetapan sistem anda."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Membuang Pelayar Tor daripada sistem anda adalah mudah:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Padam folder Pelayar Tor."
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Kosongkan Tong Sampah anda"
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Perhatian Utiliti 'Uninstall\" piawai sistem pengoperasian anda tidak "
-"digunakan."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+nb-NO.po b/contents+nb-NO.po
index 07652bf4e..bc485c77f 100644
--- a/contents+nb-NO.po
+++ b/contents+nb-NO.po
@@ -1,17 +1,17 @@
 # Translators:
 # Allan Nordhøy <epost at anotheragency.no>, 2018
 # Jørgen Moen Isaksen <klokkefriken2 at protonmail.com>, 2019
-# erinm, 2019
 # a356f726dcd9c475642ac26af10009cc, 2019
 # 490cdfb601cecc09e36402222ad5913c, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: 490cdfb601cecc09e36402222ad5913c, 2019\n"
+"Last-Translator: erinm, 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"
@@ -186,8 +186,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -390,9 +390,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -425,8 +424,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -470,12 +469,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -626,8 +624,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -637,10 +635,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 får Tor-trafikk til å fremstå tilfeldig, som obfs3, og forhindrer også"
+" sensurorganer fra å finne broer ved skanning av Internett. obfs4-broer har "
+"mindre sjanse for blokkering enn obfs3-broer."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -654,22 +655,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 får Tor-trafikk til å fremstå tilfeldig, som obfs3, og forhindrer også"
-" sensurorganer fra å finne broer ved skanning av Internett. obfs4-broer har "
-"mindre sjanse for blokkering enn obfs3-broer."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -781,9 +766,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -834,25 +818,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -949,9 +931,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1001,8 +983,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1063,13 +1045,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1118,8 +1100,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1182,8 +1164,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1268,19 +1249,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1291,19 +1264,11 @@ msgstr "Side.no"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1314,10 +1279,6 @@ msgstr "Siden som blir besøkt."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1367,10 +1328,6 @@ msgstr "Hvorvidt Tor blir brukt."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1440,59 +1397,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Tryggest"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"På dette nivået vil HTML5-video og -lyd bli klikk-for-å-spille via NoScript;"
-" alle JavaScript-ytelsesforbedringer er avskrudd; noen matematiske ligninger"
-" vil kanskje ikke vises skikkelig; noen skriftvisningsfunksjoner er "
-"avskrudd; noen typer bilder er avskrudd; JavaScript er avskrudd som forvalg "
-"på alle nettsider; de fleste video- og lyd -formater er avskrudd; og noen "
-"skrifter og ikoner vil kanskje ikke vises ordentlig."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Tryggere"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Forvalg"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"På dette nivået, er alle nettleser-funksjoner påskrudd. Dette er det mest "
-"brukbare."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1583,32 +1531,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1619,7 +1564,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1724,8 +1669,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1816,11 +1760,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1932,8 +1876,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1945,9 +1889,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2031,8 +1974,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2047,46 +1990,118 @@ msgstr "Hvordan fjerne Tor-nettleseren fra ditt system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor-nettleseren har ingen innvirking på innstillinger eller programvare som "
-"allerede finnes på maskinen din. Avinstallering av Tor-nettleseren vil "
-"heller ikke ha noen innvirkning."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Tøm papirkurven din."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Merk at det vanlige verktøyet i ditt operativsystem \"Avinstaller\" ikke "
-"blir brukt."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+nl.po b/contents+nl.po
index 43297ded8..d63016de9 100644
--- a/contents+nl.po
+++ b/contents+nl.po
@@ -1,17 +1,17 @@
 # Translators:
-# erinm, 2019
 # Tonnes <tonnes.mb at gmail.com>, 2019
 # bacovane <bart-ts at tushmail.com>, 2019
 # Emma Peel, 2019
-# Meteor OID, 2019
+# Meteor0id, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Meteor OID, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -187,13 +187,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Standaard houdt de Tor Browser je surfgeschiedenis niet bij. Cookies zijn "
-"enkel geldig voor de huidige sessie (tot de Tor Browser gesloten wordt of <a"
-" href=\"/managing-identities/#new-identity\">Nieuwe Identieit</a> wordt "
-"aangevraagd)"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -404,9 +400,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -439,8 +434,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -483,12 +478,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -641,8 +635,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -652,14 +646,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"door obfs3 lijkt Tor verkeer willekeurig, zodat het niet op Tor of een ander"
-" protocol lijkt. Terwijl het standaard nog is inbegrepen, is het aanbevolen "
-"om in plaats daarvan obfs4 te gebruiken, daar het ten opzichte van obfsw "
-"verschillende beveiligingsverbeteringen heeft."
+"obsf4 laat Tor verkeer random lijken, gelijk obfs3, en voorkomt ook dat "
+"censors bridges vinden door Internet scanning. obsf4 bridges zijn minder "
+"waarschijnlijk geblokkeerd dan obfs3 bridges."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -673,22 +666,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obsf4 laat Tor verkeer random lijken, gelijk obfs3, en voorkomt ook dat "
-"censors bridges vinden door Internet scanning. obsf4 bridges zijn minder "
-"waarschijnlijk geblokkeerd dan obfs3 bridges."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -800,9 +777,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -853,25 +829,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -967,9 +941,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1019,8 +993,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1082,13 +1056,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1137,8 +1111,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1202,8 +1176,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1289,19 +1262,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1312,19 +1277,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1335,10 +1292,6 @@ msgstr "De site die wordt bezocht."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1388,10 +1341,6 @@ msgstr "Of Tor gebruikt wordt of niet."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1465,60 +1414,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Veiligste"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Op dit level, HTML5 video en audio bekomen click-to-play via NoScript; alle "
-"JavaScript prestatie optimalisaties zijn uitgeschakeld sommige wiskundige "
-"uitdrukkingen worden niet correct weergeven; sommige font rendering features"
-" zijn uitgeschakeld; sommige types van afbeeldingen zijn uitgeschakeld; "
-"JavaScript is standaard uitgeschakeld op alle websites; meeste video en "
-"audio formats zijn uitgeschakeld; en sommige fonts en iconen worden niet "
-"correct weergeven."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Veiliger"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standaard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Op dit level zijn alle browser features ingeschakeld. Dit is de meest "
-"bruikbare optie."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1609,32 +1548,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1645,7 +1581,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1750,8 +1686,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1841,11 +1776,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1958,8 +1893,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1971,9 +1906,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2057,8 +1991,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2073,46 +2007,118 @@ msgstr "Hoe verwijder je de Tor Browser van je systeem"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser heeft geen invloed op bestaande software of instellingen op uw "
-"computer. Tor Browser verwijderen zal geen invloed hebben uw systeem's "
-"software of instellingen."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Verwijder de Tor Browser-folder of -applicatie."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Let erop dat de standaard \"de-installeer\" tool van je operating system "
-"niet wordt gebruikt."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+pl.po b/contents+pl.po
index ba30340dd..ed6961b96 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1,18 +1,18 @@
 # Translators:
 # Dawid Job <hoek at tuta.io>, 2018
 # Emma Peel, 2019
-# erinm, 2019
-# Waldemar Stoczkowski, 2019
 # Filip <filipiczesio at vp.pl>, 2019
 # Dawid Potocki <dpot at disroot.org>, 2019
+# erinm, 2019
+# Waldemar Stoczkowski, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Dawid Potocki <dpot at disroot.org>, 2019\n"
+"Last-Translator: Waldemar Stoczkowski, 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"
@@ -195,13 +195,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Domyślnie, Przeglądarka Tor nie przechowuje żadnej historii przeglądania. "
-"Ciasteczka są ważne tylko na jedną sesję (do momentu, gdy przeglądarka Tor "
-"zostanie zamknięta lub gdy zostanie zażądana <a href=\"/managing-identities"
-"/#new-identity\">Nowa Tożsamość</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -427,15 +423,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"W większości przypadków przycisk „Połącz” pozwoli Ci połączyć się z siecią "
-"Tor bez dalszej konfiguracji. Po kliknięciu, pojawi się pasek stanu, "
-"pokazujący postęp w łączeniu z siecią Tor. Jeżeli posiadasz stosunkowo "
-"szybkie łącze, a pasek stanu utknie w miejscu, sprawdź stronę <a "
-"href=\"/troubleshooting\">Rozwiązywanie problemów</a> by znaleźć pomoc."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -467,15 +457,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Na pierwszym ekranie pojawi się pytanie, czy dostęp do sieci Tor jest "
-"zablokowany lub ocenzurowany na Twoim połączeniu. Jeśli wierzysz, że tak nie"
-" jest, wybierz \"Nie\". Jeśli wiesz, że Twoje połączenie jest cenzurowane "
-"lub próbowałeś i nie udało Ci się połączyć z siecią Tor i żadne inne "
-"rozwiązania nie zadziałały, wybierz \"Tak\". Następnie zostaniesz "
-"przeniesiony do ekranu Omijanie, aby skonfigurować transport wtykowy."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -520,20 +504,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Większość <a href=\"/transports\">Transportów Wtykowych</a>, takich jak "
-"obfs3 i obfs4, opiera się na wykorzystaniu przekaźników \"mostkowych\". "
-"Podobnie jak zwykłe przekaźniki Tor, mosty są obsługiwane przez "
-"wolontariuszy; jednak w przeciwieństwie do zwykłych przekaźników, nie są one"
-" wymienione publicznie, więc przeciwnik nie może ich łatwo zidentyfikować. "
-"Używanie mostów w połączeniu z transportami wtykowymi pomaga ukryć fakt, że "
-"korzystasz z Tora."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -704,8 +680,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -715,14 +691,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 sprawia, że ruch Tora wygląda losowo, że nie wygląda jak Tor lub "
-"jakikolwiek inny protokół. Mimo, że nadal jest domyślnie dołączony, zaleca "
-"się użycie obfs4 zamiast niego, ponieważ ma kilka ulepszeń zabezpieczeń w "
-"stosunku do obfs3."
+"obfs4 sprawia, że ruch Tora wygląda losowo jak obfs3, a także uniemożliwia "
+"cenzorom znalezienie mostów poprzez skanowanie Internetu. Mosty obfs4 są "
+"mniej podatne na zablokowanie niż mosty obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -736,22 +711,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 sprawia, że ruch Tora wygląda losowo jak obfs3, a także uniemożliwia "
-"cenzorom znalezienie mostów poprzez skanowanie Internetu. Mosty obfs4 są "
-"mniej podatne na zablokowanie niż mosty obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -880,16 +839,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Bezpośredni dostęp do sieci Tor może czasem zostać zablokowany przez "
-"dostawcę usług internetowych lub rząd. Przeglądarka Tor zawiera pewne "
-"narzędzia służące do obchodzenia tych blokad. Narzędzia te są nazywane "
-"\"transportami wtykowymi\". Zobacz <a href=\"/en-US/transports\">Transporty "
-"Wtykowe</a>, aby uzyskać więcej informacji na temat aktualnie dostępnych "
-"rodzajów transportów."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -947,36 +899,24 @@ msgstr "##### Z KTÓREGO TRANSPORTU POWINIENEM KORZYSTAĆ?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Każdy z transportów wymienionych w menu Tor Launchera działa w inny sposób "
-"(więcej szczegółów znajdziesz na stronie <a href=\"/en-"
-"US/transports\">Transportów Wtykowych</a>), a ich skuteczność zależy od "
-"indywidualnych okoliczności."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Jeśli po raz pierwszy próbujesz obejść zablokowane połączenie, powinieneś "
-"spróbować różnych transportów: obfs3, obfs4, fte, i meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Jeśli wypróbujesz wszystkie te opcje, a żadna z nich nie zapewni Ci dostępu "
-"do Internetu, będziesz musiał wprowadzić adresy mostu ręcznie. Przeczytaj "
-"sekcje <a href=\"/en-US/bridges/\">Mosty</a>, aby dowiedzieć się, czym są "
-"mosty i jak je uzyskać."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1074,12 +1014,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
-"W obwodzie, węzeł Guard lub wejściowy jest pierwszym węzłem i jest automatycznie i losowo wybierany przez Tor. Ale różni się od innych węzłów w obwodzie. Aby uniknąć ataków profilujących, węzeł Guard zmienia się dopiero po 2-3 miesiącach, w przeciwieństwie do innych węzłów, które zmieniają się wraz z każdą nową domeną. Aby uzyskać więcej informacji na temat Guard, odwiedź \n"
-"<a href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> i <a href=\"https://support.torproject.org/tbb/tbb-2/\">Portal Pomocy Technicznej</a>."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1129,12 +1067,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Zobacz stronę <a href=\"/secure-connections\">Bezpieczne Połączenia</a> "
-"dla ważnych informacji o tym jak zabezpieczyć swoje połączenie podczas "
-"logowania."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1205,22 +1140,14 @@ msgstr "###### NOWY OBWÓD TOR DLA TEJ STRONY"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Opcja ta jest przydatna, jeśli używany <a href=\"/about/#how-tor-"
-"works\">przekaźnik wyjściowy</a> nie jest w stanie połączyć się z wymaganą "
-"stroną internetową lub nie ładuje jej prawidłowo. Wybranie jej spowoduje "
-"ponowne załadowanie aktualnie aktywnej karty lub okna w nowym obwodzie Tor. "
-"Inne otwarte karty i okna z tej samej strony internetowej będą korzystać z "
-"nowego obwodu również po ich ponownym załadowaniu. Ta opcja nie usuwa "
-"żadnych prywatnych informacji ani nie odlinkuje twojej aktywności, ani nie "
-"wpływa na twoje obecne połączenia z innymi stronami internetowymi."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1272,12 +1199,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Cały ruch pomiędzy użytkownikami Tor i usługami cebulowymi jest szyfrowany"
-" od-początku-do-końca, więc nie musisz się martwić o <a href=\"/secure-"
-"connections\">łączenie się poprzez HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1354,12 +1278,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Możesz również upewnić się że masz dostęp do innych usług cebulowych, łącząc"
-" się do <a href=\"http://3g2upl4pq6kufc4m.onion/\">Usługi Cebulowej "
-"DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1455,19 +1375,11 @@ msgstr "##### POTENCJALNIE WIDOCZNE DANE"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1478,19 +1390,11 @@ msgstr "Strona.pl"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1501,10 +1405,6 @@ msgstr "Odwiedzana witryna."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1554,10 +1454,6 @@ msgstr "Czy używany jest Tor."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1634,66 +1530,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Najbezpieczniejszy"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Na tym poziomie, wideo HTML5 i audio stają się kliknij-aby-odtworzyć poprzez"
-" NoScript; wszystkie optymalizacje wydajności JavaScript są wyłączone; "
-"niektóre równania matematyczne mogą nie być wyświetlane prawidłowo; niektóre"
-" funkcje renderowania czcionek są wyłączone; niektóre typy obrazów są "
-"wyłączone domyślnie na wszystkich stronach; większość formatów wideo i audio"
-" jest wyłączona; a niektóre czcionki i ikony mogą nie być wyświetlane "
-"poprawnie."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Bezpieczniej"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Na tym poziomie, wideo i audio HTML5 stają się kliknij-aby-odtworzyć poprzez"
-" NoScript; wszystkie optymalizacje wydajności JavaScript są wyłączone; "
-"niektóre równania matematyczne mogą nie być wyświetlane prawidłowo; niektóre"
-" funkcje renderowania czcionek są wyłączone; niektóre typy obrazów są "
-"wyłączone; a JavaScript jest domyślnie wyłączony na wszystkich stronach bez "
-"<a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standardowy"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Na tym poziomie wszystkie funkcje przeglądarki są włączone. Jest to "
-"najbardziej używalna opcja."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1804,42 +1684,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Na tym poziomie wszystkie funkcje Przeglądarki Tor i stron internetowych są "
-"włączone."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Ten poziom wyłącza funkcje strony internetowej, które często są "
-"niebezpieczne."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Może to spowodować utratę funkcjonalności niektórych stron."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript jest wyłączony na wszystkich stronach bez <a href=\"/secure-"
-"connections\">HTTPS</a>; niektóre czcionki i symbole matematyczne są "
-"wyłączone; dźwięk i obraz (media HTML5) są kliknij-aby-odtworzyć."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Ten poziom pozwala jedynie na korzystanie z funkcji stron internetowych "
-"wymaganych dla stron statycznych i prostych usług."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1849,13 +1717,10 @@ msgstr "Zmiany te mają wpływ na zdjęcia, media i skrypty."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript jest domyślnie wyłączony na wszystkich stronach; niektóre "
-"czcionki, ikony, symbole matematyczne i zdjęcia są wyłączone; dźwięk i wideo"
-" (media HTML5) są kliknij-aby-odtworzyć."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1958,12 +1823,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Usuń Przeglądarkę Tor ze swojego systemu, usuwając folder, który go zawiera "
-"(zobacz sekcję <a href='uninstalling'>Odinstalowanie</a> w celu uzyskania "
-"dodatkowych informacji)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2058,21 +1919,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Użytkownicy, którzy wymagają wysokiego poziomu bezpieczeństwa w przeglądaniu"
-" stron internetowych, powinni ustawić <a href=\"/security-slider\">Suwak "
-"Bezpieczeństwa</a> Przeglądarki Tor na \"Bezpieczniejszy\" (co wyłącza "
-"JavaScript dla stron internetowych innych niż HTTPS) lub "
-"\"Najbezpieczniejszy\" (co czyni to dla wszystkich stron internetowych). "
-"Jednakże wyłączenie JavaScriptu uniemożliwi wyświetlanie wielu witryn "
-"internetowych poprawnie, więc domyślnym ustawieniem Przeglądarki Tor jest "
-"umożliwienie wszystkim witrynom uruchamiania skryptów w trybie "
-"\"Standardowym\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2192,11 +2044,9 @@ msgstr "##### CZY JEST TWOJE POŁĄCZENIE CENZUROWANE?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Jeśli nadal nie możesz się połączyć, Twój dostawca usług internetowych może cenzurować połączenia do sieci Tor. Przeczytaj \n"
-"sekcje <a href=\"/circumvention\">Obchodzenie</a> dla możliwych rozwiązań."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2207,12 +2057,9 @@ msgstr "##### ZNANE PROBLEMY"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Przeglądarka Tor jest w ciągłym rozwoju, a niektóre problemy są znane, ale nie zostały jeszcze rozwiązane. Proszę sprawdź \n"
-"stronę <a href=\"/known-issues\">Znane Problemy</a>, aby sprawdzić, czy problem, którego doświadczasz, nie jest już tam wymieniony."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2310,12 +2157,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent w szczególności <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">nie jest anonimowy poprowadzony przez "
-"Tora</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2329,50 +2173,118 @@ msgstr "Jak usunąć Przeglądarkę Tora z Twojego systemu"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Usunięcie Przeglądarki Tor z twojego systemu jest proste:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Przeglądarka Tor nie ma wpływu na żadne z istniejących programów i ustawień "
-"na komputerze. Odinstalowanie Przeglądarki Tor nie ma wpływu na "
-"oprogramowanie lub ustawienia systemu."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Usunięcie Przeglądarki Tor z twojego systemu jest proste:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Usuń folder przeglądarki Tor lub aplikację."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Opróżnij kosz."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Znajdź folder Przeglądarki Tor. Domyślną lokalizacją w systemie Windows "
-"jest Pulpit; w systemie macOS jest to folder Aplikacje. W Linuksie nie ma "
-"domyślnej lokalizacji, jednak folder będzie nosił nazwę \"tor-browser_pl\", "
-"jeśli używasz polskiej wersji Przeglądarki Tor."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Usuń folder Przeglądarki Tor."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Opróżnij Kosz"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Zwróć uwagę, że standardowe narzędzie \"Odinstaluj\" twojego systemu "
-"operacyjnego nie jest używane."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 8f31b8feb..1e59ad801 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -1,20 +1,19 @@
 # Translators:
-# drebs <drebs at riseup.net>, 2018
 # Chacal E., 2019
 # Communia <ameaneantie at riseup.net>, 2019
-# erinm, 2019
 # Emma Peel, 2019
 # Eduardo Addad de Oliveira <eduardoaddad at hotmail.com>, 2019
 # Alexei Gonçalves de Oliveira <alexis at gessicahellmann.com>, 2019
 # Cy Belle <cyb3ll3 at protonmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Cy Belle <cyb3ll3 at protonmail.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,13 +196,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Por padrão, o Navegador Tor não mantém registros de histórico de navegação. "
-"Os cookies são válidos apenas por uma sessão (isto é, até que o usuário "
-"feche o Navegador Tor ou requisite uma <a href=\"/managing-identities/#new-"
-"identity\">Nova Identidade</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -431,16 +426,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Na maior parte dos casos, escolher \"Conectar-se\" será o bastante para "
-"conectar-se à rede Tor sem necessidade de outras configurações. Após clicar "
-"em \"Conectar-se\" a barra de status aparecerá, mostrando a progressão da "
-"conexão. Se você dispuser de uma conexão rápida, mas essa barra parar a um "
-"certo ponto, consulte a página <a href=\"/troubleshooting\">Como solucionar "
-"problemas</a> para obter ajuda."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -472,15 +460,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"A primeira tela pergunta se a sua conexão bloqueia ou censura o seu acesso à"
-" rede Tor. Se você não acredita que seja o caso, selecione “Não”. Se você "
-"souber que a sua conexão é cesurada, ou se você tiver tentado mas não "
-"conseguido se conectar à rede Tor, e que nenhuma solução tiver dado certo, "
-"selecione “Sim”. A tela <a href=\"/circumvention\">Driblar a censura</a> "
-"será aberta para que você configure um transportador plugável."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -524,19 +506,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"A maioria dos <a href=\"/transports\">Transportadores Plugáveis</a>, como "
-"obfs3 e obfs4, baseiam-se no uso de relays \"ponte\". Assim como relays "
-"comuns do Tor, pontes são executadas por voluntárias.os. A diferença é que "
-"elas não se encontram em listas públicas, de modo que não é fácil para um "
-"adversário identificá-las. O uso combinado de pontes et de transportadores "
-"plugáveis ajuda a disfarçar o fato de que você usa Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -708,8 +683,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -719,15 +694,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"O obfs3 confere uma aparência aleatória ao tráfego do Tor, de modo que ele "
-"não seja identificável como pertencente ao Tor ou a qualquer outro "
-"protocolo. Embora ainda seja incluído por padrão, recomendamos que você o "
-"substitua pelo obfs4 devido a seus diversos aperfeiçoamentos de segurança em"
-" relação ao obfs3."
+"obfs4 faz com que o tráfego do Tor pareça aleatório, assim como obfs3. Além "
+"disso, ele impede que censores encontrem pontes por meio de uma varredura na"
+" Internet. Pontes obfs4 têm menos chances de serem bloqueadas do que pontes "
+"obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -741,23 +715,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 faz com que o tráfego do Tor pareça aleatório, assim como obfs3. Além "
-"disso, ele impede que censores encontrem pontes por meio de uma varredura na"
-" Internet. Pontes obfs4 têm menos chances de serem bloqueadas do que pontes "
-"obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -885,16 +842,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Pode acontecer de o acesso direto à rede Tor ser bloqueado pelo seu provedor"
-" de serviço de Internet ou por algum governo. O Navegador Tor inclui algumas"
-" ferramentas anticensura para driblar esses bloqueios.  Essas ferramentas "
-"são chamadas \"transportadores plugáveis\". Consulte a página  <a href"
-"=\"/en-US/transports\">Transportadores Plugáveis</a> para saber mais sobre "
-"os tipos de transportadores atualmente disponíveis."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -954,36 +904,24 @@ msgstr "##### QUE TRANSPORTE DEVO USAR?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Cada um dos transportadores listados no menu do Tor Launcher funciona de "
-"maneira diferente (para mais detalhes, consultar <a href=\"/en-"
-"US/transports\">Transportadores Plugáveis</a>) e a eficácia deles depende do"
-" seu caso individual. "
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Se você estiver tentando contornar uma conexão bloqueada pela primeira vez, "
-"tente os diferentes transportes: obfs3, obfs4, fte e meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Se você tentar todas essas opções e ainda assim não conseguir conectar-se, "
-"será preciso inserir os endereços de ponte manualmente. Leia a seção <a href"
-"=\"/en-US/bridges/\">Pontes</a> para saber mais sobre o que são pontes e "
-"como obtê-las."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1081,17 +1019,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"No circuito, o nó Guard ou de entrada é o primeiro nó e é automaticamente e "
-"aleatoriamente selecionado pelo Tor. Mas é diferente dos outros nós no "
-"circuito. Para evitar ataques de criação de perfil, o nó Guard só muda após "
-"2-3 meses, ao contrário dos outros nós, que mudam a cada novo domínio. Para "
-"mais informações sobre Guardas, consulte o <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> e <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Portal de suporte</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1139,12 +1070,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Consulte a página <a href=\"/secure-connections\">Conexões seguras</a>  "
-"para obter informacoes importantes sobre como tornar sua conexão segura ao  "
-"registrar-se em sites."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1214,20 +1142,14 @@ msgstr "###### NOVO CIRCUITO TOR PARA ESTE SITE"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Esta opção é útil se o <a href=\"/about/#how-tor-works\">relay de saída</a> "
-"que você está usando não conseguir conectar-se ao website que você deseja ou"
-" não estiver carregando adequadamente. Ao selecioná-la, a aba ou a janela "
-"então ativa será recarregada através de um novo circuito Tor. Esta opção não"
-" apaga nenhuma informação privada, não desvincula sua atividade presente e "
-"passada, nem afeta suas conexões atuais a outros websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1280,12 +1202,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Todo o tráfego entre usuários do Tor e serviços onion é criptografado de "
-"ponta-a-ponta, então você não precisa se preocupar em <a href=\"/secure-"
-"connections\">usar HTTPS para conectar-se</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1363,12 +1282,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Você também pode certificar-se de que é possível acessar outros serviços "
-"onion conectando-se ao <a href=\"http://3g2upl4pq6kufc4m.onion/\">serviço "
-"onion do DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1462,19 +1377,11 @@ msgstr "##### DADOS POTENCIALMENTE VISÍVEIS"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1485,19 +1392,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1508,10 +1407,6 @@ msgstr "Site sendo visitado."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1561,10 +1456,6 @@ msgstr "Se o Tor está sendo usado ou não."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1638,66 +1529,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "O Mais seguro"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Nesse nível, mídias de vídeo e áudio HTML5 tornam-se clique-para-tocar "
-"através do NoScript; toda otimização de performance JavaScript é desativada;"
-" algumas equações matemáticas podem não ser exibidas corretamente; alguns "
-"componentes de processamento de fonte são desativados; alguns tipos de "
-"imagens são desativados; Javascript é desativado como padrão em todos os "
-"sites; a maioria dos formatos de vídeo e áudio é desativado; algumas fontes "
-"e ícones podem não ser exibidos corretamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Mais seguro"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Nesse nível, mídias de vídeo e áudio HTML5 tornam-se clique-para-tocar "
-"através do NoScript; toda otimização de performance JavaScript é desativada;"
-" algumas equações matemáticas podem não ser exibidas corretamente; alguns "
-"componentes de processamento de fonte são desativados; alguns tipos de "
-"imagens são desativados; Javascript é desativado como padrão em todos os "
-"sites que não sejam <a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Padrão"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Nesse nível, todas as funcionalidades de navegação são habilitadas. Esta é a"
-" opção que garante mais usabilidade."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1810,39 +1685,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Neste nível, todos os recursos do Navegador Tor e do site estão ativados."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "Este nível desabilita os recursos do site que costumam ser perigosos."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Isso pode fazer com que alguns sites percam a funcionalidade."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"O JavaScript está desativado em todos os sites não <a href=\"/secure-"
-"connections\">HTTPS</a>; algumas fontes e símbolos matemáticos estão "
-"desativados; áudio e vídeo (mídia HTML5) são reproduzidos com um clique."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Este nível permite apenas recursos do site necessários para sites estáticos "
-"e serviços básicos."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1852,13 +1718,10 @@ msgstr "Essas alterações afetam imagens, mídia e scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"O Javascript está desativado por padrão em todos os sites. algumas fontes, "
-"ícones, símbolos matemáticos e imagens são desativados; áudio e vídeo (mídia"
-" HTML5) são reproduzidos com um clique."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1959,12 +1822,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Remova o Navegador Tor do seu sistema apagando a pasta que o contém "
-"(consulte a seção <a href='uninstalling'>Como desinstalar Tor</a> para "
-"maiores informações)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2059,18 +1918,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"O usuários que demandam um alto grau de segurança em sua navegação web devem"
-" ajustar a <a href=\"/security-slider\">Barra de Segurança</a> até o ajuste "
-"\"Mais Seguro\" (que desabilita o Javascript em todos os websites sem HTTPS)"
-" ou \"O Mais Seguro\". Entretanto, desabilitar o JavaScript impedirá a "
-"exibição correta de diversos websites, de modo que a configuração padrão do "
-"Tor Browser permite que todos os websites rodem scripts no modo \"Padrão\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2192,13 +2045,9 @@ msgstr "##### É SUA CONEXÃO CENSURADA?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Se ainda assim você não conseguir se conectar, talvez o seu Provedor de "
-"Serviço de Internet esteja censurando conexões à rede Tor. Leia a seção <a "
-"href=\"/circumvention\">Driblar a censura</a> para encontrar possíveis "
-"soluções. "
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2209,14 +2058,9 @@ msgstr "##### PROBLEMAS CONHECIDOS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"O Navegador Tor está em constante desenvolvimento. Alguns problemas são "
-"conhecidos, mas ainda não solucionados. Por favor, consulte a página <a href"
-"=\"/known-issues\">Problemas conhecidos</a> para ver se o problema que você "
-"está encontrando já foi listado lá."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2314,12 +2158,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent, especificamente, <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">não é anônimo quando quando conecta-se"
-" via Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2333,50 +2174,118 @@ msgstr "Como remover o Navegador Tor do seu sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Remover o Navegador Tor do seu sistema é simples:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"O Navegador Tor não afeta os programas existentes nem as configurações no "
-"seu computador. Desinstalar o Navegador Tor não afetará em nada o seu "
-"programa de sistema ou as suas configurações."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Remover o Navegador Tor do seu sistema é simples:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Delete a pasta ou aplicação do Navegador Tor. "
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Esvazie a sua Lixeira."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Localize sua pasta do Navegador Tor. O local padrão no Windows é o "
-"Desktop; no macOS é a pasta Aplicativos. No Linux, não há localização "
-"padrão, no entanto, a pasta será nomeada \"tor-browser_en-US\" se você "
-"estiver executando o Navegador Tor em inglês."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Apague a pasta do Navegador Tor."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Limpe a lixeira"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Note que o serviço padrão de \"Desinstalação\"  do seu sistema operacional "
-"não é utilizado."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index faae207de..bbd544e1e 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -1,18 +1,18 @@
 # Translators:
-# erinm, 2019
 # Emma Peel, 2019
 # Hugo9191 <hugoncosta at gmail.com>, 2019
 # Rui <xymarior at yandex.com>, 2019
 # Manuela Silva <manuelarodsilva at gmail.com>, 2019
 # Nuno Rego <nuno.rego at outlook.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Nuno Rego <nuno.rego at outlook.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,13 +195,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Por padrão, o Tor Browser não mantém registos de histórico de navegação. Os "
-"cookies são válidos apenas por uma sessão (isto é, até que o utilizador "
-"feche o Tor Browser ou requisite uma <a href=\"/managing-identities/#new-"
-"identity\">Nova Identidade</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -428,16 +424,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Na maior parte dos casos, escolher \"Ligar\" permitir-lhe-á conectar-se à "
-"rede Tor sem necessidade de configurações adicionais. Após clicar em "
-"\"Ligar\", aparecerá a barra de estado, mostrando a progressão da ligação. "
-"Se tiver uma ligação rápida, mas essa barra parar num certo ponto, consulte "
-"a página <a href=\"/troubleshooting\">Resolução de problemas</a> para obter "
-"ajuda."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -469,15 +458,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"O primeiro ecrã pergunta se o seu acesso à rede Tor está a ser bloqueado ou "
-"censurado. Se acha que não é este o caso, selecione “Não”. Se souber que a "
-"sua conexão é censurada ou se tentou mas não conseguiu conectar-se à rede "
-"Tor e que nenhuma outra solução funcionou, selecione “Sim”. Irá aparecer o "
-"ecrã <a href=\"/circumvention\">Contornar</a> para que configure um "
-"transporte de ligação."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -522,20 +505,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"A maioria dos <a href=\"/transports\">Transportes de Ligação</a>, como obfs3"
-" e obfs4, baseiam-se no uso de retransmissores de \"pontes\". Assim como os "
-"retransmissores comuns do Tor, as pontes são executadas por voluntários. A "
-"diferença é que estas não se encontram em listas públicas, por forma a que "
-"não seja fácil para um adversário identificá-las. O uso combinado de pontes "
-"e de transportes de ligação ajuda a disfarçar o facto de que está a usar o "
-"Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -706,8 +681,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -717,14 +692,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"O obfs3 faz com que o tráfego do Tor pareça aleatório, para que não pareça "
-"ser o Tor ou outro protocolo. Embora ainda seja incluído por padrão, "
-"recomendamos que o substitua pelo obfs4 uma vez que tem vários melhoramentos"
-" de segurança em relação ao obfs3."
+"O obfs4 faz com que o tráfego do Tor pareça aleatório tal como o obfs3. Além"
+" disso, ele impede que os censores encontrem pontes com uma varredura na "
+"Internet. As pontes obfs4 têm menos probabilidade de serem bloqueadas do que"
+" as pontes obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -738,23 +713,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"O obfs4 faz com que o tráfego do Tor pareça aleatório tal como o obfs3. Além"
-" disso, ele impede que os censores encontrem pontes com uma varredura na "
-"Internet. As pontes obfs4 têm menos probabilidade de serem bloqueadas do que"
-" as pontes obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -883,16 +841,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"O acesso direto à rede Tor pode ser bloqueado às vezes pelo seu fornecedor "
-"de acesso à Internet ou por um governo. O Tor Browser inclui algumas "
-"ferramentas anti-censura para contornar esses bloqueios. Estas ferramentas "
-"são chamadas \"transportes de ligação\". Consulte a página  <a href=\"/en-"
-"US/transports\">Transportes de Ligação</a> para saber mais sobre os tipos de"
-" transportes disponíveis atualmente."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -951,36 +902,24 @@ msgstr "##### QUE TRANSPORTE É QUE EU DEVEREI UTILIZAR?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Cada um dos transportes listados no menu do Tor Launcher funciona de maneira"
-" diferente (para mais detalhes consultar <a href=\"/en-"
-"US/transports\">Transportes de Ligação</a>) e a eficácia deles depende das "
-"circunstâncias individuais do seu caso."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Se estiver a tentar contornar uma conexão bloqueada pela primeira vez, deve "
-"tentar transportes diferentes: obfs3, obfs4, fte e meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Se tentar todas essas opções e ainda assim não conseguir conectar-se, será "
-"preciso inserir os endereços das pontes manualmente. Leia a secção <a href"
-"=\"/en-US/bridges/\">Pontes</a> para saber mais sobre o que são pontes e "
-"como obtê-las."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1078,18 +1017,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"No circuito, o nó de guarda ou de entrada é o primeiro nó, sendo selecionado"
-" pelo Tor de forma automática e aleatória. Mas é diferente dos outros nós no"
-" circuito. Para evitar ataques de criação de perfil, o nó de guarda só muda "
-"após 2-3 meses, ao contrário dos outros nós, que mudam a cada novo domínio. "
-"Para mais informações sobre Guardas, consulte as <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">Perguntas "
-"frequentes</a> e <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Portal de ajuda</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1138,12 +1069,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Veja a página <a href=\"/secure-connections\">Conexões seguras</a>  para "
-"obter informações importantes sobre como tornar a sua conexão segura ao "
-"entrar nas suas contas dos sites."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1214,20 +1142,14 @@ msgstr "###### NOVO CIRCUITO TOR PARA ESTE SITE"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Esta opção é útil se o <a href=\"/about/#how-tor-works\">retransmissor de "
-"saída</a> que está a utilizar não for capaz de aceder ao site que deseja ou "
-"não estiver a carregar adequadamente. Ao selecioná-la, o separador ou a "
-"janela atualmente ativa será recarregada através de um novo circuito Tor. "
-"Esta opção não elimina nenhuma informação privada, não desvincula a sua "
-"atividade na rede nem afeta as suas conexões atuais a outros sites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1279,12 +1201,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Todo o tráfego entre os utilizadores do Tor e os serviços onion é "
-"encriptado de ponta-a-ponta, e asiim não precisa de se preocupar em <a href"
-"=\"/secure-connections\">ligar-se por HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1362,12 +1281,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Também pode certificar-se de que consegue aceder a outros serviços onion "
-"acedendo ao <a href=\"http://3g2upl4pq6kufc4m.onion/\">serviço onion do "
-"DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1460,19 +1375,11 @@ msgstr "##### DADOS POTENCIALMENTE VISÍVEIS"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1483,19 +1390,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1506,10 +1405,6 @@ msgstr "O site a ser visitado."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1559,10 +1454,6 @@ msgstr "Se o Tor está a ser ou não utilizado."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1636,67 +1527,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "A Mais Segura"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Neste nível, os vídeos e áudios HTML5 necessitam de clique-para-reproduzir "
-"através do NoScript; toda otimização de performance em JavaScript é "
-"desativada; algumas equações matemáticas podem não ser mostradas "
-"corretamente; alguns componentes de processamento de fontes tipográficas são"
-" desativados; alguns tipos de imagens são desativados; o Javascript é "
-"desativado como padrão em todos os sites; a maioria dos formatos de vídeo e "
-"áudio são desativados; algumas fontes e ícones podem não ser mostrados "
-"corretamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Mais Segura"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Neste nível, os vídeos e áudios HTML5 necessitam de \n"
-"clique-para-reproduzir através do NoScript; toda otimização de \n"
-"performance em JavaScript é desativada; algumas equações matemáticas \n"
-"podem não ser mostradas corretamente; alguns componentes de \n"
-"processamento de fontes tipográficas são desativados; alguns tipos de \n"
-"imagens são desativados; o Javascript é desativado como padrão em todos os sites não-<a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Padrão"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Neste nível, todas as funcionalidades do navegador estão ativadas. Esta é a "
-"opção que garante mais usabilidade."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1810,42 +1684,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Neste nível, todos as funcionalidades do Tor Browser e do site da Web estão "
-"ativadas."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Este nível desativa as funcionalidades do site da Web que costumam ser "
-"perigosos."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Isto pode fazer com que alguns sites percam a funcionalidade."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"O Javascript está desativado em todos os websites sem <a href=\"/secure-"
-"connections\">HTTPS</a>; alguns tipo de letra e símbolos matemáticos estão "
-"desativados; áudio e vídeo (HTML5 media) são presse-para-ver."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Este nível permite apenas as funcionalidades de sites necessários para os "
-"sites estáticos e serviços básicos."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1855,13 +1717,10 @@ msgstr "Estas mudanças afetam imagens, media e scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"O Javascript está desativado em todos os websites por padrão; alguns tipo de"
-" letra, ícones, símbolos matemáticos e imagens estão desativados; áudio e "
-"vídeo (HTML5 media) são presse-para-ver."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1962,11 +1821,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Remova o Tor Browser do seu sistema eliminando a pasta do Tor (consulte a "
-"secção <a href='uninstalling'>Desinstalar</a> para mais informações)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2061,19 +1917,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"O utilizadores que exijam um alto grau de segurança na sua navegação web "
-"devem ajustar o <a href=\"/security-slider\">Controle Deslizante de "
-"Segurança</a> até ao ajuste \"Mais Seguro\" (que desativa o Javascript em "
-"todos os sites sem HTTPS) ou \"Segurança Máxima\". No entanto, se desativar "
-"o JavaScript impedirá a visualização correta de diversos sites. Por isso a "
-"configuração padrão do Tor Browser é permitir a todos os sites que executem "
-"os scripts no modo \"Padrão\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2194,12 +2043,9 @@ msgstr "##### A SUA LIGAÇÃO ESTÁ CENSURADA?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Se ainda assim não conseguir ligar-se à rede, talvez o seu fornecedor de "
-"acesso à Internet esteja a bloquear ligações à rede Tor. Leia a secção <a "
-"href=\"/circumvention\">Contornar</a> para encontrar soluções. "
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2210,14 +2056,9 @@ msgstr "##### PROBLEMAS CONHECIDOS"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"O Tor Browser está em constante desenvolvimento. Alguns problemas são "
-"conhecidos, mas ainda não foram solucionados. Por favor, consulte a página "
-"<a href=\"/known-issues\">Problemas conhecidos</a> para ver se o problema "
-"que está a ter já foi reportado e é conhecido pelos programadores."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2316,12 +2157,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* O BitTorrent em específico <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">não é anónimo quando se liga à rede "
-"via Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2335,50 +2173,118 @@ msgstr "Como remover o Tor Browser do seu sistema"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Remover o Tor Browser do seu sistema é simples:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"O Tor Browser não afeta os programas existentes nem as configurações no seu "
-"computador. Se desinstalar o Tor Browser, isso não afetará em nada os seus "
-"outros programas ou configurações."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Remover o Tor Browser do seu sistema é simples:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Elimine a pasta ou aplicação do Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Limpe a sua 'Reciclagem'"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Localize a pasta do seu Tor Browser. A localização predefinida no Windows"
-" é a 'Área de Trabalho'; no macOS é a pasta das 'Aplicações'. No Linux, não "
-"existe uma localização predefinida, contudo a pasta terá o nome \"tor-"
-"browser_en-US\", se estiver a executar o Tor Browser em inglês."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Elimine a pasta do Tor Browser."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Esvazie a sua Reciclagem"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Note que  não é utilizada a funcionalidade padrão de \"Desinstalação\" do "
-"seu sistema operativo."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ro.po b/contents+ro.po
index 1fe1b5994..138c5652c 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: A C <ana at shiftout.net>, 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -194,13 +194,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"În mod prestabilit, browserul Tor nu păstrează niciun istoric de navigare. "
-"Fișierele cookie sunt valabile numai pentru o singură sesiune (până la "
-"ieșirea browserului Tor sau pentru solicitarea unei <a href=\"/managing-"
-"identities/#new-identity\">noi identități</a>)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -426,17 +422,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
-msgstr ""
-"În cele mai multe cazuri, alegerea \"Connect\" vă va permite să vă conectați"
-" la rețeaua Tor fără alte configurații. Odată ce ați făcut clic, va apărea o"
-" bară de stare care arată progresul conexiunii Tor. Dacă aveți o conexiune "
-"relativ rapidă, dar această bară pare să se blocheze într-un anumit punct, "
-"consultați pagina de remediere a problemelor <a "
-"href=\"/troubleshooting\">Troubleshooting</a>  pentru a vă ajuta să "
-"rezolvați problema.."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -468,16 +456,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Primul ecran afișează dacă accesul la rețeaua Tor este blocat sau cenzurat "
-"la conexiunea dvs. Dacă nu credeți că este cazul, selectați \"Nu\". Dacă "
-"știți că conexiunea dvs. este cenzurată sau dacă ați încercat și nu ați "
-"reușit să vă conectați la rețeaua Tor și nu au funcționat alte soluții, "
-"selectați \"Da\". Apoi, veți fi dus la ecranul <a "
-"href=\"/circumvention\">Circumvention </a> pentru a configura un transport "
-"conectabil."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -522,20 +503,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Majoritatea <a href=\"/transports\">Pluggable Transports</a>, cum ar fi "
-"obfs3 și obfs4, se bazează pe utilizarea releelor \"bridge\". La fel ca "
-"relerele obișnuite Tor, podurile (bridges) sunt rulate de voluntari; cu "
-"toate acestea, spre deosebire de releele obișnuite, ele nu sunt listate "
-"public, deci un adversar nu le poate identifica cu ușurință. Utilizarea "
-"podurilor în combinație cu transporturile conectabile vă ajută să ascundeți "
-"faptul că utilizați Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -706,8 +679,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -717,14 +690,14 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 face ca traficul Tor să fie aleatoriu, astfel încât acesta să nu arate"
-" ca Tor sau orice alt protocol. Chiar dacă obfs3 este inclus în mod "
-"implicit, este recomandat să utilizați obfs4, deoarece are mai multe "
-"îmbunătățiri de securitate față de obfs3."
+"obfs4, la fel ca și obfs3, face ca traficul Tor să fie aleatoriu și, de "
+"asemenea, împiedică cenzorii să găsească poduri prin scanarea pe Internet. "
+"Podurile obfs4 sunt mai puțin susceptibile de a fi blocate față de podurile "
+"obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -738,23 +711,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4, la fel ca și obfs3, face ca traficul Tor să fie aleatoriu și, de "
-"asemenea, împiedică cenzorii să găsească poduri prin scanarea pe Internet. "
-"Podurile obfs4 sunt mai puțin susceptibile de a fi blocate față de podurile "
-"obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -883,16 +839,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Accesul direct la rețeaua Tor poate fi uneori blocat de furnizorul de "
-"servicii Internet sau de un guvern. Tor Browser include unele instrumente de"
-" eludare pentru a obține în jurul acestor blocuri. Aceste instrumente sunt "
-"numite \"transporturi conectabile\". Consultați pagina <a href=\"/en-"
-"US/transports\">Transporturi Pluggable </a> pentru mai multe informații "
-"despre tipurile de transport disponibile în prezent."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -953,36 +902,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Fiecare dintre transporturile afișate în meniul Tor Launcher funcționează "
-"diferit (pentru mai multe detalii, consultați pagina <a href=\"/en-"
-"US/transports\">Pluggable Transports</a>), iar eficiența acestora depinde de"
-" circumstanțele individuale."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Dacă încercați să ocoliți o conexiune blocată pentru prima dată, ar trebui "
-"să încercați diferitele transporturi: obfs3, obfs4, fte și meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Dacă încercați toate aceste opțiuni și niciunul dintre ele nu va ajunge "
-"online, va trebui să introduceți manual adresele de pod. Citiți secțiunea <a"
-" href=\"/en-US/bridges/\">Poduri/Bridges</a> pentru a afla ce poduri sunt și"
-" cum să le obțineți."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1083,17 +1020,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"În circuit, Guard sau nodul de intrare este primul nod și este ales automat "
-"și aleator de către Tor. Dar este diferit de celelalte noduri din circuit. "
-"Pentru a evita atacurile de profil, nodul Guard se modifică numai după 2-3 "
-"luni, spre deosebire de celelalte noduri, care se schimbă cu fiecare domeniu"
-" nou. Pentru mai multe informații despre Guard, consultați <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> și <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1143,12 +1073,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Consultați pagina   <a href=\"/secure-connections\">Conexiuni Sigure</a> "
-"pentru informații importante despre cum să vă asigurați conexiunea la "
-"conectare."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1219,23 +1146,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Această opțiune este utilă dacă <a href=\"/about/#how-tor-works\">eleul de "
-"ieșire</a> pe care îl utilizați nu poate să se conecteze la site-ul web pe "
-"care îl solicitați sau nu îl încarcă în mod corespunzător. Selectarea "
-"opțiunii va face ca fila sau fereastra activă în prezent să fie reîncărcate "
-"pe un nou circuit Tor. Celelalte file și ferestre deschise de pe același "
-"site web vor folosi și noul circuit, odată ce sunt reîncărcate. Această "
-"opțiune nu elimină niciun fel de informații private și nu vă deconectează de"
-" la activitatea dvs., nici nu afectează conexiunile dvs. curente către alte "
-"site-uri web."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1287,12 +1205,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tot traficul dintre utilizatorii Tor și serviciile Onion este criptat end-"
-"to-end, deci nu trebuie să vă faceți griji în legătură cu <a href=\"/secure-"
-"connections\">conectarea prin HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1370,12 +1285,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"De asemenea, puteți să vă asigurați că puteți accesa alte servicii Onion "
-"prin conectarea la <a href=\"http://3g2upl4pq6kufc4m.onion/\">serviciul "
-"Onion al DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1468,19 +1379,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1491,19 +1394,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1514,10 +1409,6 @@ msgstr "Site-ul care a fost vizitat."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1567,10 +1458,6 @@ msgstr "Dacă Tor este utilizat sau nu."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1644,66 +1531,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Cel mai sigur"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"La acest nivel, mediile video și audio HTML5 devin clic-pentru-redare prin "
-"NoScript; toate optimizările de performanță JavaScript sunt dezactivate; "
-"unele ecuații matematice nu se pot afișa corect; unele funcții de redare a "
-"fontului sunt dezactivate; unele tipuri de imagini sunt dezactivate; "
-"Javascript este dezactivat în mod implicit pe toate site-urile; majoritatea "
-"formatelor video și audio sunt dezactivate; iar unele fonturi și icoane pot "
-"să nu fie afișate corect."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Mai sigur"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"La acest nivel, mediile video și audio HTML5 devin clic-pentru-redare prin "
-"NoScript; toate optimizările de performanță JavaScript sunt dezactivate; "
-"unele ecuații matematice nu se pot afișa corect; unele funcții de redare a "
-"fontului sunt dezactivate; unele tipuri de imagini sunt dezactivate; iar "
-"JavaScript este dezactivat în mod implicit pentru toate celelalte saituri "
-"non-<a href=\"/secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"La acest nivel, toate funcțiile navigatorului sunt activate. Aceasta este "
-"opțiunea cea mai utilizabilă."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1815,44 +1686,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-"La acest nivel, toate caracteristicile browserului Tor și ale site-ului Web "
-"sunt activate."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Acest nivel dezactivează caracteristicile site-ului web care sunt adesea "
-"periculoase."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Acest lucru poate cauza ca unele site-uri să își piardă funcționalitatea."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript este dezactivat pe toate site-urile non-<a href=\"/secure-"
-"connections\">HTTPS</a>; unele fonturi și simboluri matematice sunt "
-"dezactivate; fișierele audio și video (media HTML5) sunt redate doar la "
-"click pe butonul de redare."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Acest nivel permite doar caracteristicile site-ului web necesare pentru "
-"site-urile statice și serviciile de bază."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1864,14 +1721,10 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript este dezactivat în mod implicit pe toate site-urile; unele "
-"fonturi, pictograme, simboluri matematice și imagini sunt dezactivate; "
-"fișierele audio și video (media HTML5) pot fi redate doar cu click pe "
-"butonul de redare."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1972,12 +1825,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Dezinstalați Tor Browser din sistemul de operare ștergând folderul care îl "
-"conține (consultați secțiunea <a href='uninstalling'>Dezinstalare</a> pentru"
-" mai multe informații)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2071,20 +1920,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Utilizatorii care au nevoie de un grad înalt de securitate în navigarea pe "
-"internet, trebuie să seteze <a href=\"/security-slider\">Cursorul de "
-"Securitate</a> din Tor Browser la “Mai sigur / Safer” (care dezactivează "
-"JavaScript pentru site-urile non-HTTPS) sau la “Cel mai sigur / Safest” "
-"(care dezactivează JavaScript pentru toate site-urile web). Cu toate "
-"acestea, dezactivarea JavaScript va împiedica afișarea corectă a multor "
-"site-uri web, astfel încât setarea implicită a Tor Browser este să permită "
-"tuturor site-urilor web să ruleze scripturi în modul \"Standard\"."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2205,12 +2046,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Dacă tot nu vă puteți conecta, Furnizorul de servicii de Internet ar putea "
-"să cenzureze conexiuni la rețeaua Tor. Citiți secțiunea <a "
-"href=\"/circumvention\">Eludare</a> pentru soluții posibile."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2221,14 +2059,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser este în curs de dezvoltare constantă, iar unele probleme sunt "
-"cunoscute, dar încă nu au fost rezolvate. Verificați pagina <a href"
-"=\"/known-issues\">Probleme cunoscute</a> pentru a vedea dacă problema pe "
-"care o întâmpinați este deja afișată acolo."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2326,11 +2159,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Suplimentul BitTorrent nu este <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">anonim în Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2344,50 +2175,118 @@ msgstr "Cum să elimini Tor Browser din sistemul tău"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Eliminarea Tor Browser din sistemul dvs. este simplă:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser nu afectează niciun software sau setările existente de pe "
-"computer. Dezinstalarea Tor Browser nu va afecta software-ul sau setările "
-"sistemului."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Eliminarea Tor Browser din sistemul dvs. este simplă:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
-"1. Localizați folderul Tor Browser. Locația implicită în Windows este "
-"Desktop; în macOS este dosarul Applications. În Linux, nu există o locație "
-"implicită, însă dosarul va fi numit \"tor-browser_en-US\" dacă folosiți "
-"browserul Tor în engleză."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Ștergeți directorul Tor Browser."
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Goliți folderul cu lada de gunoi / Trash"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Rețineți că nu este utilizat utilitarul standard \"Uninstall\" al sistemului"
-" de operare."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+ru.po b/contents+ru.po
index a54ae1526..361ba72cb 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -2,19 +2,19 @@
 # Evgeny Aleksandrov <5678lutya at gmail.com>, 2019
 # JZDLin, 2019
 # Sergey Leschina <mail at putnik.tech>, 2019
-# erinm, 2019
 # Valentine Bobrovsy <vbabrouski at outlook.com>, 2019
 # Emma Peel, 2019
 # Sergey Smirnov <cj75300 at gmail.com>, 2019
 # Legenden Rifk <rekytcsgo at gmail.com>, 2019
+# erinm, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Legenden Rifk <rekytcsgo at gmail.com>, 2019\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -193,12 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"По умолчанию Tor Browser не сохраняет историю посещений сайтов. Cookies "
-"хранятся лишь в течение сессии (пока вы не закроете Tor Browser или <a href"
-"=\"/managing-identities/#new-identity\">не смените личность</a> в сети Tor)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -424,15 +421,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Как правило, достаточно выбрать \"Соединиться\", и вы подключитесь к сети "
-"Tor без дополнительных настроек. После нажатия этой кнопки вы сможете "
-"наблюдать процесс подключения к Tor. Если у вас достаточно быстрый интернет,"
-" но процесс завис, обратитесь к разделу <a href=\"/troubleshooting\">решения"
-" проблем</a>."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -463,15 +454,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Сначала программа спросит, правда ли, что доступ к сети Tor заблокирован или"
-" подвержен цензуре. Если считаете, что это не так, выберите \"Нет\". Если "
-"цензура есть, или вы уже пытались, но не смогли подключиться к сети Tor, и "
-"ничто другое не помогло, выберите \"Да\". Вы попадете в окно настройки "
-"подключаемых транспортов для <a href=\"/circumvention\">обхода "
-"блокировок</a>."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -514,19 +499,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Большинство <a href=\"/transports\">подключаемых транспортов</a> (например, "
-"obfs3 и obfs4) использует узлы-\"мосты\". Как и обычные узлы Tor, мосты "
-"управляются добровольцами. В отличие от обычных узлов, мосты не публикуются,"
-" чтобы злоумышленник не смог их легко идентифицировать. Использование мостов"
-" вместе с подключаемыми транспортами помогает скрыть тот факт, что вы "
-"используете Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -692,8 +670,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -703,13 +681,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"При использовании obfs3 трафик Tor выглядит как случайный, он не похож ни на"
-" трафик Tor, ни на какой-либо другой. Хотя этот тип по-прежнему доступен, "
-"лучше использовать транспорт obfs4, более совершенный в смысле безопасности."
+"Транспорт obfs4 тоже \"превращает\" трафик Tor в случайный и вдобавок мешает"
+" цензорам обнаружить мосты путем сканирования сети. Мосты obfs4 сложнее "
+"блокировать, чем мосты obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -723,22 +701,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"Транспорт obfs4 тоже \"превращает\" трафик Tor в случайный и вдобавок мешает"
-" цензорам обнаружить мосты путем сканирования сети. Мосты obfs4 сложнее "
-"блокировать, чем мосты obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -864,15 +826,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Может случиться, что доступ к сети Tor заблокирован вашим интернет-"
-"провайдером или правительством. Tor Browser включает некоторые инструменты "
-"для обхода блокировок. Эти инструменты называются подключаемыми "
-"транспортами. Дополнительную информацию о доступных типах транспортов см. на"
-" <a href=\"/en-US/transports\">соответствующей странице</a>."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -930,34 +886,24 @@ msgstr "##### Какой транспорт следует использова
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Транспорты из меню в настройках Tor работают по-разному (подробнее см. на "
-"странице <a href=\"/en-US/transports\">Подключаемые транспорты</a>). Их "
-"эффективность зависит от обстоятельств."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Если вы пытаетесь обойти блокировку подключения впервые, советуем "
-"попробовать разные транспорты: obfs3, obfs4, fte и meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Если вы попробуете все варианты, но ни один из них не сработает, придется "
-"ввести адреса мостов вручную. В разделе <a href=\"/en-"
-"US/bridges/\">Мосты</a> рассказано, какие бывают мосты и как их получить."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1050,17 +996,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Сторожевой или входной узел – первый в цепочке. Tor выбирает его "
-"автоматически случайным образом. Этот узел отличается от других. Чтобы "
-"избежать профилирующих атак, входной узел меняется лишь каждые 2-3 месяца (а"
-" другие узлы меняются для каждого нового домена). Подробнее о сторожевых "
-"узлах можно узнать в <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> и <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Портале поддержки</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1108,11 +1047,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Чтобы узнать о том, как защитить ваше подключение при входе в систему, см."
-" раздел <a href=\"secure-connections\">\"Безопасные соединения\"</a>."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1180,19 +1117,14 @@ msgstr "##### Новая цепочка Tor для этого cайта"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
-"Пригодится, если <a href=\"/about/#how-tor-works\">выходной узел</a> не "
-"может подключиться к нужному сайту или загружает его неправильно. Окно "
-"(вкладка) перезагрузится через новую цепочку Tor. Остальные владки и окна с "
-"тем же сайтом также будут использовать новую цепочку. Эта опция не удаляет "
-"личные данные и не влияет на текущие соединения с другими сайтами."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1244,12 +1176,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Весь трафик между пользователями Tor и onion-сервисами защищен сквозным "
-"шифрованием. Не нужно беспокоиться о <a href=\"secure-"
-"connections\">подключении по HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1324,12 +1253,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Хотите убедиться, что у вас по-прежнему есть доступ к onion-сервисам? "
-"Подключитесь к <a href=\"http://3g2upl4pq6kufc4m.onion/\">onion-сервису "
-"DuckDuckGo</a>."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1419,19 +1344,11 @@ msgstr "##### Потенциально видимые данные"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1442,19 +1359,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1465,10 +1374,6 @@ msgstr "Рассматриваемый сайт."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1518,10 +1423,6 @@ msgstr "Используется Tor или нет."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1594,64 +1495,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Наиболее безопасные"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Для проигрывания видео и аудио в HTML5 требуется дополнительное "
-"подтверждение (NoScript). Оптимизация производительности JavaScript "
-"отключена. Некоторые математические формулы могут отображаться неверно. "
-"Отключены некоторые возможности отображения шрифтов. Отключены некоторые "
-"типы изображений. JavaScript отключен по умолчанию на всех сайтах. Отключено"
-" большинство форматов видео и аудио. Некоторые шрифты и значки могут "
-"отображать некорректно."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Более безопасные"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Для проигрывания видео и аудио в HTML5 требуется дополнительное "
-"подтверждение (NoScript). Оптимизация производительности JavaScript "
-"отключена. Некоторые математические формулы могут отображаться неверно. "
-"Отключены некоторые возможности отображения шрифтов. Отключены некоторые "
-"типы изображений. JavaScript отключен по умолчанию на всех сайтах, где нет "
-"<a href=\"/secure-connections\">HTTPS</a>. "
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Стандартные"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
-msgstr "Все функции браузера включены. Это самый популярный вариант."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1745,32 +1632,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1781,7 +1665,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1882,11 +1766,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Удалите Tor Browser из вашей системы: нужно удалить папку с программой "
-"(подробнее см. <a href='uninstalling'>Удаление программы</a>)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1978,18 +1859,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Если нужна высокая степень безопасности, сдвиньте <a href=\"/security-"
-"slider\">ползунок</a> в положение \"Более безопасные\" (JavaScript будет "
-"отключен на сайтах без HTTPS) или \"Наиболее безопасные\" (то же, но на всех"
-" сайтах). Поскольку отключение JavaScript мешает правильному отображению "
-"многих сайтов, в Tor Browser по умолчанию используется режим \"Стандартные\""
-" (скрипты разрешены для всех сайтов)."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2105,11 +1980,9 @@ msgstr "##### Ваше интернет-соединение цензуриру
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Если по-прежнему не получается, возможно, провайдер блокирует Tor. См. "
-"раздел <a href=\"/circumvention\">Обход блокировки Tor</a>."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2120,14 +1993,9 @@ msgstr "##### Известные проблемы"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser постоянно развивается. Некоторые проблемы известны, но еще не "
-"исправлены. Пожалуйста, проверьте страницу <a href=\"/known-"
-"issues\">Особенности Tor Browser</a>. Есть ли там проблема, с которой вы "
-"столкнулись?"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2222,12 +2090,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent <mark><a href=\"https://blog.torproject.org/bittorrent-over-"
-"tor-isnt-good-idea\">не позволяет оставаться анонимным в сети "
-"Tor</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2241,49 +2106,118 @@ msgstr "Как удалить Tor Browser из системы"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Удалить Tor Browser из вашей системы просто:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Ни установка, ни удаление Tor Browser не влияют на другие программы или "
-"настройки на вашем компьютере."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Удалить Tor Browser из вашей системы просто:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Удалите приложение или папку Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Очистите Корзину."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
-"1. Найдите папку Tor Browser. Расположением по умолчанию на Windows является"
-" рабочий стол; на macOS это папка приложений. На Linux нет расположения по "
-"умолчанию, однако папка будет называться «tor-browser_en-US», если вы "
-"используете англоязычный Tor Browser."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Удалите папку Tor Browser."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Очистите Корзину."
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Обратите внимание на то, что обычная процедура удаления программ вашей "
-"операционной системы не задействуется."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+sr.po b/contents+sr.po
index 67bc47b0b..9501ad087 100644
--- a/contents+sr.po
+++ b/contents+sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Aleksa Ristić, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -191,12 +191,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Po difoltu, Tor Pregledač ne čuva istoriju pregledanja. Kolačići su validni "
-"samo tokom jedne sesije (dok se ne izadje iz Tor Pregledača ili dok se <a "
-"href=\"/managing-identities/#new-identity\">Nov Identitet</a> ne zatraži). "
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -415,9 +412,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -447,8 +443,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -486,12 +482,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -642,8 +637,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obsf3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -653,14 +648,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 čini da saobraćaj kroz Tor deluje nasumičan, dakle ne izgleda kao Tor "
-"ili bilo koji drugi protokol. Iako je i dalje podrazumevano uključen "
-"preporučljivo je koristiti obfs4 koji ima nekoliko bezbednosnih unapređenja "
-"u odnosu na obfs3."
+"obfs4 čini da saobraćaj kroz Tor deluje kao nasumičan, kao i obfs3, s tim "
+"što obfs4 sprečava cenzore da skeniranjem interneta pronađu mostove. Manja "
+"je šansa da će obfs4 mostovi biti blokirani nego kada su to obfs3 mostovi. "
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -674,22 +668,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 čini da saobraćaj kroz Tor deluje kao nasumičan, kao i obfs3, s tim "
-"što obfs4 sprečava cenzore da skeniranjem interneta pronađu mostove. Manja "
-"je šansa da će obfs4 mostovi biti blokirani nego kada su to obfs3 mostovi. "
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -803,9 +781,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -856,25 +833,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -950,9 +925,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -989,8 +964,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1045,13 +1020,13 @@ msgstr "###### NOVO TOR KOLO ZA OVAJ SAJT"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1096,8 +1071,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1157,8 +1132,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1234,19 +1208,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1257,19 +1223,11 @@ msgstr "stranica.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1280,10 +1238,6 @@ msgstr "Sajt je već posećen."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1331,10 +1285,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1397,13 +1347,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Najsigurniji"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1415,31 +1365,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Sigurniji"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standardni"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1532,32 +1481,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1568,7 +1514,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1657,8 +1603,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1734,11 +1679,11 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1837,8 +1782,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1850,9 +1795,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1936,8 +1880,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1952,40 +1896,117 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Obrišite Tor Browser direktorijum ili aplikaciju."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Ispraznite otpad."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
diff --git a/contents+sv-SE.po b/contents+sv-SE.po
index d2e35049e..83b0d8a10 100644
--- a/contents+sv-SE.po
+++ b/contents+sv-SE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Jonatan Nyberg, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -184,8 +184,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -390,9 +390,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -425,8 +424,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -469,12 +468,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -623,8 +621,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -634,14 +632,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 gör att Tor-trafik ser slumpmässigt, så att det inte ser ut som Tor "
-"eller något annat protokoll. Medan det fortfarande ingår som standard "
-"rekommenderas det att använda obfs4 istället, eftersom det har flera "
-"säkerhetsförbättringar över obfs3."
+"obfs4 gör att Tor-trafiken ser slumpmässigt ut som obfs3, och hindrar också "
+"censorer från att hitta broar via Internet-skanning. obfs4-bryggor är mindre"
+" benägna att blockeras än obfs3-broar."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -655,22 +652,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 gör att Tor-trafiken ser slumpmässigt ut som obfs3, och hindrar också "
-"censorer från att hitta broar via Internet-skanning. obfs4-bryggor är mindre"
-" benägna att blockeras än obfs3-broar."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -784,9 +765,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -837,25 +817,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -952,9 +930,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1004,8 +982,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1067,13 +1045,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1122,8 +1100,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1193,8 +1171,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1278,19 +1255,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1301,19 +1270,11 @@ msgstr "Sajt.se"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1324,10 +1285,6 @@ msgstr "Webbplatsen som besöks."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1377,10 +1334,6 @@ msgstr "Om Tor används eller ej"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1451,60 +1404,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Säkrast"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"På den här nivån blir HTML5-video och ljudmedia klicka-för-att-spela via "
-"NoScript; alla JavaScript-prestandaoptimeringar är inaktiverade; vissa "
-"matematiska ekvationer kanske inte visas korrekt; vissa typsnittsfunktioner "
-"är inaktiverade; vissa typer av bilder är inaktiverade; Javascript är "
-"inaktiverat som standard på alla webbplatser; De flesta video- och "
-"ljudformat är inaktiverade; och vissa typsnitt och ikoner kanske inte visas "
-"korrekt."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Säkrare"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"På den här säkerhetsnivån är webbläsarens alla funktioner aktiverade. Detta "
-"är det mest användbara alternativet. "
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1595,32 +1538,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1631,7 +1571,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1735,8 +1675,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1826,11 +1765,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1942,8 +1881,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1955,9 +1894,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2041,8 +1979,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2057,46 +1995,118 @@ msgstr "Hur du raderar Tor webbläsare från ditt system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser påverkar inte någon befintlig programvara eller inställningar på"
-" din dator. Avinstallation av Tor Browser påverkar inte ditt systems program"
-" eller inställningar."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Observera att operativsystemets standard \"Avinstallera\"-verktyg inte "
-"används."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+th.po b/contents+th.po
index 4b67f2acb..096e4aaa4 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: DN DN <deen6 at protonmail.com>, 2019\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -200,12 +200,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"โดยค่าเริ่มต้น Tor Browser จะไม่เก็บประวัติการท่องเว็บใดๆ "
-"คุกกี้จะใช้ได้แค่หนึ่งครั้ง (จนกระทั่งออกจาก Tor Browser หรือ <a href"
-"=\"/managing-identities/#new-identity\">ตัวตนใหม่</a>จะถูกขอ)"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -430,16 +427,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"ในกรณีส่วนใหญ่การเลือก \"เชื่อมต่อ\" จะช่วยให้คุณเชื่อมต่อกับเครือข่าย Tor "
-"ได้โดยไม่ต้องกำหนดค่าใด ๆ เพิ่มเติม "
-"เมื่อคลิกแล้วแถบสถานะจะปรากฏขึ้นเพื่อแสดงความคืบหน้าการเชื่อมต่อของ Tor "
-"หากคุณกำลังเชื่อมต่อที่รวดเร็ว "
-"แต่แถบนี้ดูเหมือนจะติดอยู่ที่จุดหนึ่งให้ดูที่หน้า  <a "
-"href=\"/troubleshooting\">การแก้ไขปัญหา</a> เพื่อช่วยในการแก้ปัญหา"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -470,16 +460,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"หน้าจอแรกจะถามว่าการเข้าถึงเครือข่าย Tor "
-"นั้นถูกบล็อกหรือถูกเซ็นเซอร์ในการเชื่อมต่อของคุณหรือไม่ "
-"หากคุณไม่เชื่อว่าเป็นกรณีนี้ให้เลือก“ ไม่” "
-"หากคุณรู้ว่าการเชื่อมต่อของคุณถูกเซ็นเซอร์หรือคุณได้ลองและไม่สามารถเชื่อมต่อกับเครือข่าย"
-" Tor และไม่มีวิธีแก้ไขปัญหาอื่นให้เลือก“ ใช่” จากนั้นคุณจะถูกนำไปที่หน้าจอ "
-"<a href=\"/circumvention\">การหลีกเลี่ยง </a> "
-"เพื่อกำหนดค่าการขนส่งที่เสียบได้"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -523,20 +506,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"ส่วนมาก <a href=\"/transports\">การขนส่งที่เสียบกับช่องต่อได้</a>,เช่น obfs3"
-" และ obfs4 ขึ้นอยู่กับการใช้ \"สะพาน\" รีเลย์ เช่นเดียวกับ Tor รีเลย์ทั่วไป "
-"สะพานจะดำเนินการโดยอาสาสมัคร แตกต่างจากรีเลย์ธรรมดา "
-"อย่างไรก็ตามพวกมันไม่ได้อยู่ในรายการสาธารณะดังนั้นฝ่ายตรงข้ามไม่สามารถระบุได้ง่าย"
-" "
-"การใช้สะพานร่วมกับการขนส่งที่เสียบกับข่องต่อได้จะช่วยให้คุณทราบว่าคุณกำลังใช้"
-" Tor อยู่"
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -702,8 +677,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -713,13 +688,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 ทำให้การจราจร Tor ดูเป็นแบบสุ่ม ซึ่งทำให้ดูไม่เหมือน Tor "
-"หรือโพรโทคอลอื่นๆ และถึงแม้ว่า obfs3 จะเป็นค่าตั้งต้น แต่การใช้ obfs4 "
-"เป็นที่แนะนำมากกว่า เนื่องจาก obfs4 มีการพัฒนาด้านความปลอดภัยเหนือกว่า obfs3"
+"obfs4 ทำให้การจราจรของ Tor ดูเหมือน obfs3 แบบสุ่ม "
+"และป้องกันการเซ็นเซอร์ที่จะมองหาการเชื่อมต่อจากการสแกนอินเทอร์เน็ต obfs4 "
+"มีโอกาสถูกบล็อกน้อยกว่าการเชื่อมต่อแบบ obfs3"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -733,22 +708,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 ทำให้การจราจรของ Tor ดูเหมือน obfs3 แบบสุ่ม "
-"และป้องกันการเซ็นเซอร์ที่จะมองหาการเชื่อมต่อจากการสแกนอินเทอร์เน็ต obfs4 "
-"มีโอกาสถูกบล็อกน้อยกว่าการเชื่อมต่อแบบ obfs3"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -877,16 +836,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"การเข้าถึงเครือข่าย Tor "
-"โดยตรงบางครั้งอาจจะถูกบล็อกโดยผู้ให้บริการอินเทอร์เน็ตของคุณหรือรัฐบาล Tor "
-"Browser ได้รวมเครื่องมือที่ใช้ในการหลบเลี่ยงการบล็อกเหล่านี้ "
-"เครื่องมือเหล่านี้เรียกว่า “pluggable transports” ดูที่ <a href=\"/en-"
-"US/transports\">pluggable transports "
-"หน้า</a>เพื่อข้อมูลเกี่ยวกัลประเภทของการโอนถ่ายข้อมูลที่มีใช้อยู่ในตอนนี้"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -946,35 +898,24 @@ msgstr "##### การโอนถ่ายข้อมูลใดที่ฉ
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"แต่ละการโอนถ่ายข้อมูลที่มีให้เลือกในเมนูตัวเปิด Tor ทำงานในหลายรูปแบบ "
-"(สำหรับรายละเอียดที่เพิ่มขึ้น ดูที่ <a href=\"/en-US/transports\"> หน้า "
-"Pluggable Transports  </a>) "
-"และประสิทธิภาพของเครื่องมือเหล่านี้ขึ้นอยู่กับเงื่อนไขของแต่ละบุคคล"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"ถ้าคุณพยายามหลบเลี่ยงจากการบล็อกการเชื่อมต่อเป็นครั้งแรก คุณควรลองใช้ "
-"transport หลายๆ แบบเช่น obfs3, obfs4, fte และ meek-azure"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"ถ้าคุณลองใช้ตัวเลือกทั้งหมดแล้ว แต่ไม่มีตัวเลือกใดทำให้คุณออนไลน์ "
-"คุณจำเป็นต้องใส่ที่อยู่บริดจ์เอง อ่านส่วน<a href=\"/en-"
-"US/bridges/\">สะพาน</a>เพื่อเรียนรู้ว่าสะพานคืออะไรและจะได้สะพานมาได้อย่างไร"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1070,16 +1011,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
-"ในวงจร Guard หรือโหนดรายการเป็นโหนดแรก และจะถูกเลือกโดยอัตโนมัติและสุ่มโดย "
-"Tor แต่มันแตกต่างจากโหนดอื่น ๆ ในวงจร เพื่อหลีกเลี่ยงการโจมตีโปรไฟล์ โหนด "
-"Guard จะเปลี่ยนหลังจากผ่านไป 2-3 เดือนเท่านั้นซึ่งแตกต่างจากโหนดอื่น ๆ "
-"ที่เปลี่ยนไปด้วยทุกโดเมนใหม่ สำหรับข้อมูลเพิ่มเติมเกี่ยวกับ Guards ให้ดูที่ "
-"<a href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> และ <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">พอร์ทัลการสนับสนุน</a>"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1125,11 +1060,9 @@ msgstr "เมื่อคุณเข้าสู่เว็บไซต์ผ
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* ดูหน้า <a href=\"/secure-connections\">การเชื่อมต่อ</a> "
-"ที่ปลอดภัยสำหรับข้อมูลสำคัญเกี่ยวกับวิธีการรักษาความปลอดภัยการเชื่อมต่อของคุณเมื่อเข้าสู่ระบบ"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1195,22 +1128,14 @@ msgstr "###### วงจร TOR  ใหม่ สำหรับเว็บไ
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"ตัวเลือกนี้มีประโยชน์หาก <a href=\"/about/#how-tor-works\">รีเลย์ทางออก</a> "
-"ที่คุณใช้ไม่สามารถเชื่อมต่อกับเว็บไซต์ที่คุณต้องการได้ "
-"หรือโหลดอย่างไม่ถูกต้อง "
-"การเลือกมันจะทำให้แท็บหรือหน้าต่างที่ใช้งานอยู่ในปัจจุบันโหลดซ้ำผ่านวงจร Tor"
-" ใหม่ แท็บและหน้าต่างแบบเปิดอื่น ๆ "
-"จากเว็บไซต์เดียวกันจะใช้วงจรใหม่เช่นกันเมื่อมีการโหลดซ้ำ "
-"ตัวเลือกนี้ไม่ได้ล้างข้อมูลส่วนตัวหรือยกเลิกการเชื่อมโยงกิจกรรมของคุณและจะไม่มีผลต่อการเชื่อมต่อปัจจุบันของคุณไปยังเว็บไซต์อื่น"
-" ๆ"
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1259,12 +1184,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"*การปริมาณการใช้งานทั้งหมดระหว่างผู้ใช้ Tor และบริการ onion "
-"เป็นการเข้ารหัสแบบครบวงจรดังนั้นคุณไม่จำเป็นต้องกังวลเกี่ยวกับ <a href"
-"=\"/secure-connections\">การเชื่อมต่อผ่าน HTTPS</a>"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1341,12 +1263,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"คุณสามารถมั่นใจได้ว่าคุณสามารถเข้าถึงบริการ  onion อื่นได้ โดยการเชื่อต่อยัง"
-" <a href=\"http://3g2upl4pq6kufc4m.onion/\">การบริการ onion ของ "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1439,19 +1357,11 @@ msgstr "##### ข้อมูลที่อาจมองเห็นได้
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1462,19 +1372,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1485,10 +1387,6 @@ msgstr "มีการเยี่ยมชมไซต์"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1537,10 +1435,6 @@ msgstr "ไม่ว่าจะมีการใช้งาน Tor หรื
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1612,65 +1506,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "ปลอดภัยที่สุด"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"ในระดับนี้วิดิโอ HTML5 และสื่อเสียงกลายเป็นคลิกเพื่อเล่นผ่านทาง NoScript "
-"ซึ่งปิดการใช้งานการปรับประสิทธิภาพของJavaScript "
-"สมการทางคณิตศาสตร์บางสมการอาจไม่สมบูรณ์ ปิดการใช้งานคุณสมบัติในการแสดงข้อมูล"
-" ปิดการใช้งานรูปบางประเภท "
-"ปิดการใช้งานการตั้งค่าเริ่มต้นของJavascriptในทุกไซต์ "
-"ปิดการใช้งานรูปแบบวิดิโอและเสียง การแสดงผลแบบอักษรและไอคอนอาจไม่ถูกต้อง"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "ปลอดภัยยิ่งขึ้น"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"ในระดับนี้วิดิโอ HTML5 และสื่อเสียงกลายเป็นคลิกเพื่อเล่นผ่านทาง NoScript "
-"ซึ่งปิดการใช้งานการปรับประสิทธิภาพของJavaScript "
-"สมการทางคณิตศาสตร์บางสมการอาจไม่สมบูรณ์ ปิดการใช้งานคุณสมบัติในการแสดงข้อมูล"
-" ปิดการใช้งานรูปบางประเภท ปิดการใช้งานการตั้งค่าเริ่มต้นของJavascript "
-"ปิดการใช้งานการตั้งค่าเริ่มต้นบนไซต์ที่ไม่เป็น<a href=\"/secure-"
-"connections\">HTTPS</a>"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "มาตรฐาน"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"ในระดับนี้ เปิดการใช้งานคุณสมบัติเบราว์เซอร์ทั้งหมด "
-"นี่คือตัวเลือกที่มีความสามารถในการใช้งานมากที่สุด"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1777,38 +1656,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "ในระดับนี้ Tor Browserและคุณสมบัติของเว็บไซต์ทั้งหมดจะถูกปิดการใช้งาน"
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "ในระดับนี้จะปิดการใช้งานคุณสมบัติของเว็บไซต์ที่มักเป็นอันตราย"
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "นี่อาจทำให้ไซต์บางไซต์สูญเสียฟังก์ชันในการใช้งาน"
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"ปิดการใช้งานJavaScriptบนไซต์ที่ไม่เป็น<a href=\"/secure-connections\"> "
-"HTTPS</a> ทั้งหมด "
-"แบบอักษรและสัญลักษณ์ทางคณิตศาสตร์บางตัวเช่นเสียงหรือวิดิโอ( HTML media) "
-"เป็นแบบคลิกเพื่อเล่น"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"ระดับนี้อนุญาติให้ใช้คุณสมบัติเว็บไซต์ที่จำเป็นต่อไซต์ทางสถิติและบริการพื้นฐานอื่นๆ"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1818,13 +1689,10 @@ msgstr "การแก้ไขนี้จะส่งผลกระทบต
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"ปิดการใช้งานJavascriptตั้งแต่เริ่มต้นบนไซต์ทั้งหมด แบบอักษร ไอคอน "
-"สัญลักษณ์ทางคณิตศาสตร์ และภาพบางอย่างจะถูกปิดใช้งาน เสียงและวิดิโอ "
-"(สื่อHTML5) เป็นแบบคลิกเพื่อเล่น"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1923,11 +1791,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"นำ Tor Browser ออกจากระบบของคุณโดยลบแฟ้มที่มี Tor Browser (ดูส่วน <a "
-"href='uninstalling'>ยกเลิกการติดตั้ง</a> สำหรับข้อมูลเพิ่มเติม"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2021,19 +1886,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"ผู้ใช้งานที่จำเป็นต้องใช้ความปลอดภัยระดับสูงในการเรียกดูเว็บควรตั้งค่า<a "
-"href=\"/security-slider\">แถบเลื่อนความปลอดภัย</a>ของ Tor Browser "
-"ไปที่ปลอดภัยยิ่งขึ้น ซึ่งปิดการใช้งาน JavaScript สำหรับเว็บไซต์ที่ไม่เป็น "
-"HTTPS หรือ ปลอดภัยที่สุดสำหรับทุกเว็บไซต์ อย่างไรก็ตามการปิดการใช้งาน "
-"JavaScriptจะทำให้เว็บไซต์หลายเว็บไม่สามารถแสดงผลได้อย่างถูกต้อง "
-"ดังนั้นการตั้งค่าเริ่มต้นของ Tor Browser "
-"อนุญาติให้เว็บไซต์ทั้งหมดทำงานสคริปต์ในโหมดมาตรฐาน"
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2152,12 +2010,9 @@ msgstr "##### การเชื่อมต่อของคุณได้ถ
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"หากคุณยังไม่สามารถเชื่อมต่อได้ผู้ให้บริการอินเทอร์เน็ตของคุณอาจตัดการเชื่อมต่อกับเครือข่าย"
-" Tor อ่านส่วน<a "
-"href=\"/circumvention\">การหลบเลี่ยง</a>ปัญหาเพื่อหาแนวทางแก้ไข"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2168,14 +2023,9 @@ msgstr "##### ปัญหาที่ทราบ"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser "
-"อยู่ระหว่างการพัฒนาอย่างต่อเนื่องและบางประเด็นเป็นที่ทราบกันดีว่ายังไม่ได้รับการแก้ไข"
-" โปรดตรวจสอบหน้า<a href=\"/known-"
-"issues\">ปัญหาที่ทราบ</a>เพื่อดูว่าปัญหาที่คุณประสบอยู่แสดงอยู่ในรายการนั้นหรือไม่"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2271,11 +2121,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"*BitTorrentโดยเจาะจงแล้ว<mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">ไม่นิรนามบน Tor</a></mark>"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2289,50 +2137,118 @@ msgstr "วิธีการลบ Tor บราวเซอร์ ออกจ
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "การลบ Tor Browser ออกจากระบบของคุณเป็นเรื่องง่าย"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser ไม่ส่งผลกระทบต่อซอฟท์แวร์ใดๆที่มีอยู่แล้ว "
-"หรือการตั้งค่าคอมพิวเตอร์ของคุณ การยกเลิกการติดตั้ง Tor Browser "
-"ของคุณจะไม่ส่งผลต่อระบบซอฟท์แวร์หรือการตั้งค่า"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "การลบ Tor Browser ออกจากระบบของคุณเป็นเรื่องง่าย"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
-"1. ค้นหาโฟลเดอร์ Tor Browser ของคุณ ตำแหน่งเริ่มต้นบน Windows คือเดสก์ท็อป "
-"บน macOS เป็นโฟลเดอร์ แอปฟิลเคชันชัน บน Linux "
-"ไม่มีตำแหน่งเริ่มต้นอย่างไรก็ตามโฟลเดอร์จะมีชื่อว่า \"tor-browser_en-US\" "
-"หากคุณใช้งาน English Tor Browser"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. ลบแฟ้ม Tor Browser"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "ล้างถังขยะของคุณ"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"โปรดทราบว่าไม่มีการใช้งานระบบปฏิบัติการพื้นฐาน "
-"ไม่มีการใช้โปรแกรมถอดการติดตั้ง"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+tr.po b/contents+tr.po
index cf2195407..c212b8c18 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: erinm, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
@@ -193,13 +193,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Varsayılan olarak Tor Browser tarama geçmişini kaydetmez. Çerezler yalnız "
-"tek bir oturum için geçerlidir (Tor Browser kapatılana ya da <a href"
-"=\"/managing-identities/#new-identity\">Yeni Kimlik</a> bağlantısına "
-"tıklanana kadar)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -425,16 +421,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Çoğu durumda, \"Bağlan\" üzerine tıklamak başka bir yapılandırmaya gerek "
-"duymadan Tor ağına bağlanmanızı sağlar. Bağlan üzerine tıklandığında, Tor "
-"bağlantısının ilerleme durumunu gösteren bir durum çubuğu görüntülenir. "
-"Nispeten hızlı bir bağlantınız olduğu halde durum çubuğu belli bir noktada "
-"takılıp kalıyorsa, sorunu çözmek üzere yardım almak için <a "
-"href=\"/troubleshooting\">Sorun Giderme</a> bölümüne bakabilirsiniz."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -466,16 +455,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"İlk bölümde, bağlantınız üzerinden Tor ağına erişimin engellenmesi ya da "
-"sansürlenmesi ile ilgili bilgi alınır. Durumun böyle olmadığını "
-"düşünüyorsanız, \"Hayır\" üzerine tıklayın. Bağlantınızın sansürlendiğini "
-"biliyorsanız ya da Tor ağına bağlanmayı deneyip bağlanamadıysanız ve başka "
-"bir çözüm işe yaramadıysa, \"Evet\" üzerine tıklayın. Böylece, bir "
-"Değiştirilebilir Taşıyıcıyı yapılandırabileceğiniz <a "
-"href=\"/circumvention\">Engelleri Aşma</a> bölümüne yönlendirilirsiniz."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -520,20 +502,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"obfs3 ve obfs4 gibi <a href=\"/transports\">Değiştirilebilir "
-"Taşıyıcıların</a> çoğu “köprü” aktarıcıları kullanır. Köprü aktarıcıları da "
-"sıradan Tor aktarıcıları gibi gönüllüler tarafından işletilir. Ancak sıradan"
-" aktarıcılardan farklı olarak herkese açık olarak duyurulmazlar. Böylece "
-"izleme ve engelleme yapmak isteyen kuruluşlar köprüleri kolayca "
-"belirleyemez. Köprülerin Değiştirilebilir Taşıyıcılar ile birlikte "
-"kullanılması bağlantı trafiğinizin Tor ile gizlenmesine yardımcı olur."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -702,8 +676,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -713,14 +687,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3, Tor trafiğinin rastgele bir trafik gibi görünmesini sağlar. Böylece "
-"Tor ya da başka herhangi bir iletişim kuralı gibi görünmez. Hala varsayılan "
-"olarak kullanılsa da obfs3 yerine ek güvenlik geliştirmeleri yapılmış obfs4 "
-"köprülerinin kullanılması önerilir."
+"obfs4, obfs3 gibi Tor trafiğinin rastgele görünmesini sağlar ve ayrıca ağı "
+"izleyenlerin İnternet taraması ile köprüleri bulmasını önler. obfs4 "
+"köprülerinin engellenme olasılığı, obfs3 köprülerine göre daha azdır."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -734,22 +707,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4, obfs3 gibi Tor trafiğinin rastgele görünmesini sağlar ve ayrıca ağı "
-"izleyenlerin İnternet taraması ile köprüleri bulmasını önler. obfs4 "
-"köprülerinin engellenme olasılığı, obfs3 köprülerine göre daha azdır."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -880,16 +837,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Bazen Internet Hizmeti Sağlayıcınız ya da hükümet tarafından Tor ağına "
-"doğrudan erişim engellenebilir. Bu engellemeleri aşmak için Tor Browser "
-"uygulamasında bazı araçlar bulunur. Bu araçlara \"Değiştirilebilir "
-"Taşıyıcılar\" denir. Kullanılabilecek aktarım türleri hakkında ayrıntılı "
-"bilgi almak için <a href=\"/en-US/transports\">Değiştirilebilir "
-"Taşıyıcılar</a> bölümüne bakabilirsiniz."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -950,37 +900,24 @@ msgstr "##### HANGİ DEĞİŞTİRİLEBİLİR TAŞIYICIYI KULLANMALIYIM?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Tor Başlatıcı menüsünde görüntülenen Değiştirilebilir Taşıyıcıların her biri"
-" farklı şekillerde çalışır (ayrıntılı bilgi almak için <a href=\"/en-"
-"US/transports\">Değiştirilebilir Taşıyıcılar</a> bölümüne bakabilirsiniz) ve"
-" işe yarama durumları size özel koşullara göre değişir."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
-"Engellenen bir bağlantıyı ilk kez aşmaya çalışıyorsanız, farklı "
-"Değiştirilebilir Taşıyıcıları denemelisiniz: obfs3, obfs4, fte ve meek-"
-"azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Bu seçeneklerin tümünü denediğiniz halde hiçbiri çevrimiçi olmanızı "
-"sağlayamıyor ise, köprü adreslerini el ile yazmanız gerekir. Köprülerin ne "
-"olduğunu ve bilgilerini nasıl edinebileceğinizi öğrenmek için <a href=\"/en-"
-"US/bridges/\">Köprüler</a> bölümüne bakabilirsiniz."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1078,18 +1015,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
-msgstr ""
-"Devrede, Koruyucu ya da giriş durağı ilk duraktır ve Tor tarafından otomatik"
-" ve rastgele olarak seçilir. Ancak, devredeki diğer duraklardan farklıdır. "
-"Koruyucu durak, her yeni etki alanı ile değiştirilen diğer duraklardan "
-"farklı olarak, profil oluşturma saldırılarını önlemek için yalnız 2-3 ayda "
-"bir değiştirilir. Koruyucular hakkında ayrıntılı bilgi almak için, <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">SSS</a> ve <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Destek Sitesi</a> "
-"bölümlerine bakabilirsiniz."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1137,12 +1066,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Oturum açarken bağlantınızın güvenliğini sağlamak hakkında önemli "
-"bilgileri görmek için <a href=\"/secure-connections\">Güvenli "
-"Bağlantılar</a> bölümüne bakabilirsiniz."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1211,22 +1137,14 @@ msgstr "###### BU SİTE İÇİN YENİ TOR DEVRESİ"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Bu seçenek, kullandığınız <a href=\"/about/#how-tor-works\">çıkış "
-"aktarıcısı</a>istediğiniz web sitesine bağlanamıyorsa ya da site düzgün "
-"yüklenmiyorsa işe yarar. Seçildiğinde, etkin sekme ya da pencerenin yeni bir"
-" Tor devresi üzerinden yeniden yüklenmesini sağlar. Aynı web sitesinden "
-"açılmış diğer sekme ve pencereler de yeniden yüklendiklerinde bu yeni "
-"devreyi kullanır. Bu seçeneğin kullanılması, herhangi bir kişisel bilgiyi "
-"temizlemez, işlemlerinizi kesintiye uğratmaz ya da açık olan diğer web "
-"sitesi bağlantılarınızı etkilemez."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1279,12 +1197,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tor kullanıcıları ile Onion hizmetleri arasındaki tüm trafik uçtan uca "
-"şifrelenir. Bu nedenle <a href=\"/secure-connections\">HTTPS kullanarak "
-"bağlanmayı</a> dert etmeniz gerekmez."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1361,12 +1276,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Ayrıca <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo Onion "
-"Hizmeti</a>sayfasına bağlanarak diğer Onion hizmetlerine de "
-"erişebileceğinizden emin olabilirsiniz"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1461,19 +1372,11 @@ msgstr "##### GÖRÜLMESİ OLASI VERİLER"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1484,19 +1387,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1507,10 +1402,6 @@ msgstr "Ziyaret edilen site."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1559,10 +1450,6 @@ msgstr "Tor kullanılıp kullanılmadığı."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1637,66 +1524,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "En Güvenli"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Bu düzeyde, HTML5 görüntü ve ses ortamları NoScript üzerinden tıklanıp "
-"oynatılabilir. Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır. "
-"Bazı matematik denklemleri düzgün şekilde görüntülenmeyebilir. Bazı yazı "
-"türü görüntüleme özellikleri devre dışı bırakılır. Bazı görsel türleri devre"
-" dışı bırakılır. JavaScript varsayılan olarak tüm sitelerde devre dışıdır. "
-"Çoğu görüntü ve ses biçimi devre dışı bırakılır. Bazı yazı türleri ve "
-"simgeler doğru görüntülenmeyebilir."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Daha Güvenli"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Bu düzeyde, HTML5 görüntü ve ses ortamları NoScript üzerinden tıklayıp "
-"oynatılabilir. Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır. "
-"Bazı matematik denklemleri düzgün şekilde görüntülenmeyebilir. Bazı yazı "
-"türü görüntüleme özellikleri devre dışı bırakılır. Bazı görsel türleri devre"
-" dışı bırakılır. JavaScript, varsayılan olarak <a href=\"secure-"
-"connections\">HTTPS</a> olmayan tüm sitelerde devre dışı bırakılır."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standart"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Bu düzeyde, tüm tarayıcı özellikleri etkin olur. En kullanışlı seçenek "
-"budur."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1810,42 +1681,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
-"Bu güvenlik düzeyinde tüm Tor Browser ve web sitesi özellikleri "
-"kullanılabilir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
-"Bu güvenlik düzeyinde genellikle tehlikeli olan web sitesi özellikleri devre"
-" dışı bırakılır."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "Bu güvenlik düzeyinde bazı sitelerin işlevleri düzgün çalışmayabilir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"<a href=\"/secure-connections\">HTTPS</a> kullanmayan sitelerde JavaScript "
-"devre dışı bırakılır. Bazı yazı tipleri ve matematik simgeleri devre dışı "
-"bırakılır. Ses ve görüntü  (HTML5 ortamları) tıklanıp oynatılabilir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"Bu güvenlik düzeyinde yalnız durağan siteler ve temel hizmetler için gerekli"
-" web sitesi özelliklerine izin verilir."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1855,13 +1714,10 @@ msgstr " Bu değişiklikler görselleri, ortamları ve betikleri etkiler."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"JavaScript varsayılan olarak tüm sitelerde devre dışı bırakılır. Bazı yazı "
-"tipleri ve matematik simgeleri devre dışı bırakılır. Ses ve görüntü  (HTML5 "
-"ortamları) tıklanıp oynatılabilir."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1964,12 +1820,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Tor Browser uygulamasının bulunduğu klasörü silerek sisteminizden kaldırın "
-"(ayrıntılı bilgi almak için <a href='uninstalling'>Kaldırma</a> bölümüne "
-"bakın)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2066,20 +1918,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Web sitelerinde gezinirken yüksek derecede güvenlik isteyen kullanıcılar, "
-"Tor Browser üzerindeki <a href=\"/security-slider\">Güvenlik Düzeyi "
-"Ayarını</a> \"Daha Güvenli\" (HTTPS olmayan web siteleri için JavaScript "
-"devre dışı) ya da \"En Güvenli\" (tüm web siteleri için JavaScript devre "
-"dışı) olarak seçmelidir. Bununla birlikte, JavaScript devre dışı "
-"bırakıldığında birçok web sitesi düzgün çalışmayabilir. Bu nedenle Tor "
-"Browser varsayılan olarak \"Standart\" güvenlik düzeyinde tüm web "
-"sitelerinin betikleri çalıştırmasına izin verir."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2201,13 +2045,9 @@ msgstr "##### BAĞLANTINIZ SANSÜRLENİYOR MU?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Hala bağlantı kurulamıyorsa , İnternet Hizmeti Sağlayıcınız Tor ağına "
-"yapılan bağlantıları engelliyor olabilir. Bu sorunun olası çözümlerini "
-"öğrenmek için <a href=\"/circumvention\">Engelleri Aşma</a> bölümüne "
-"bakabilirsiniz."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2218,14 +2058,9 @@ msgstr "##### BİLİNEN SORUNLAR"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor Browser sürekli geliştirilmekte olduğundan henüz düzeltilmemiş bazı "
-"sorunlar olduğu bilinmektedir. Herhangi bir sorunla karşılaşırsanız lütfen "
-"<a href=\"/known-issues\">Bilinen Sorunlar</a> bölümünden karşılaştığınız "
-"sorunun buradaki listede olup olmadığına bakın."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2324,12 +2159,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* Özellikle BitTorrent <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">Tor üzerinde anonim "
-"değildir</a></mark>."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2343,50 +2175,136 @@ msgstr "Tor Browser bilgisayarınızdan nasıl kaldırılır"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Tor Browser sisteminizden kolayca kaldırılabilir:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr "Windows üzerinde:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser, bilgisayarınızda bulunan diğer uygulama ya da ayarları "
-"etkilemez. Tor Browser uygulamasının kaldırılması, sisteminizdeki "
-"uygulamaları ya da ayarlarını etkilemez."
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak Masaüstü"
+" klasörü kullanılır."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Tor Browser sisteminizden kolayca kaldırılabilir:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Tor Browser klasörünü ya da uygulamasını silin."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Çöp kutunuzu boşaltın."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr "macOS üzerinde:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+"* Tor Browser klasörünü ya da uygulamasını bulun. Varsayılan olarak "
+"Applications klasörü kullanılır."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr "* Tor Browser uygulamasını çöp kutusuna atın."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr "* `~/Library/Application Support/` klasörüne gidin."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. Tor Browser klasörünüzü bulun. Varsayılan klasör Windows üzerinde "
-"Masaüstü; macOS üzerinde Uygulamalar klasörüdür. Linux üzerinde varsayılan "
-"konum yoktur, ancak kullandığınız Tor Browser İngilizce ise \"tor-"
-"browser_en-US\" klasör adı kullanılır."
+"* yeni macOS sürümlerinde Library klasörünün gizli olduğunu unutmayın. Bu "
+"klasörü açmak için Finder içinde \"Git\" menüsünde \"Klasöre Git...\" "
+"seçeneğini kullanın."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Tor Browser klasörünü silin."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+"*  Açılan pencereye \"~/Library/Application Support/\" yazıp Git üzerine "
+"tıklayın."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr "* Tor Browser-Data klasörünü bulup çöp kutusuna atın."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr "Linux üzerinde:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+"* Tor Browser klasörünü bulun. Linux üzerinde varsayılan konum yoktur, ancak"
+" kullandığınız Tor Browser İngilizce ise \"tor-browser_en-US\" adında bir "
+"klasör olmalıdır."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Çöp kutunuzu boşaltın"
+msgid "* Delete the Tor Browser folder."
+msgstr "* Tor Browser klasörünü silin."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
 "Kaldırma işlemi için işletim sisteminizde bulunan standart \"Uygulama "
-"Kaldırma\" aracının kullanılmayacağını unutmayın."
+"Kaldırma\" aracının kullanılmadığını unutmayın."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+uk.po b/contents+uk.po
index b4e8b7eff..7292a792f 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Sergio Thirdlingson <serge3ling at gmail.com>, 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -192,8 +192,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -402,16 +402,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"У більшості випадків, для з'єднання з мережею Tor достатньо натиснути "
-"«З'єднатися», без потреби додаткових налаштуван. Після натискання з'явиться "
-"панель прогресу підключення Tor. Якщо ви на відносно швидкому з'єднанні, але"
-" повзунок прогресу застряг на якійсь точці, ознайомтеся зі сторінкою <a "
-"href=\"/uk/troubleshooting\">Вирішення проблем</a>, де є допоміжна "
-"інформація."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -442,15 +435,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"На першому екрані вас запитують, чи доступ до мережі Tor блокується або "
-"цензурується у вашому з'єднанні. Якщо ви вважаєте, що ні, оберіть «Ні». Якщо"
-" ви знаєте, що ваше з'єднання цензурується, або ви невдало пробували "
-"під'єднатися до мережі Tor й інші рішення не допомогли, оберіть «Так». Далі "
-"ви перейдете на екран <a href=\"/uk/circumvention\">обману</a>, де "
-"налаштовується вставних транспорт."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -495,19 +482,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Більшість вставних траспортів (<a href=\"/uk/transports\">Pluggable "
-"Transports</a>), як obfs3 та obfs4, залежать від використання «мостових» "
-"реле. Подібно до звичайних реле Tor'у, мости підтримують волонтери, але на "
-"відміну від звичайних реле, вони не згадуються публічно, тому противник не "
-"зможе легко їх ідентифікувати. Використання мостів у поєднанні зі вставними "
-"транспортами допомагає приховати той факт, що ви використовуєте Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -660,8 +640,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -671,9 +651,9 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
@@ -688,19 +668,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr ""
 
@@ -810,15 +777,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Прямий доступ до мережі Tor може часом бути заблокованим вашим провайдером "
-"інтернет-послуг або урядом. Tor-браузер містить декілька інструментів омани "
-"задля обходу цих блокувань. Ці інстументи мають назву «вставних "
-"транспортів». Див. детальнішу інформацію про доступні типи транспортів на "
-"сторінці <a href=\"/uk/transports\">Pluggable Transports</a>."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -868,34 +829,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Кожен транспорт, перерахований у меню запуску Tor, працює іншим чином "
-"(детальніше читайте на сторінці <a href=\"/uk/transports\">Pluggable "
-"Transports</a>), і їхня ефективність залежить від ваших індивідуальних "
-"обставин."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Якщо ви спробували усі опції, і за жодної немає доступу онлайн, вам треба "
-"ввести адреси мостів вручну. Ознайомтеся з розділом <a "
-"href=\"/uk/bridges/\">Мости</a>, де йдеться про те, що таке мости і як їх "
-"отримати."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -989,9 +940,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1039,12 +990,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"Див. сторінку <a href=\"/uk/secure-connections\">Безпечне з'єднання</a>, де "
-"є важлива інформація про те, як убезпечити своє з'єднання під час входу в "
-"систему."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1104,13 +1052,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1159,12 +1107,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"Весь трафік між користувачами Tor і службами onion цілком зашифрований, так "
-"що вам не потрібно турбуватися про <a href=\"/uk/secure-"
-"connections\">підключення через HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1223,8 +1168,7 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1300,19 +1244,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1323,19 +1259,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1346,10 +1274,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1397,10 +1321,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1463,13 +1383,13 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Найбезпечніший"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1481,31 +1401,30 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Безпечніше"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Стандарт"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
 
@@ -1598,32 +1517,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1634,7 +1550,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1723,8 +1639,7 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1800,11 +1715,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1903,8 +1818,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1916,9 +1831,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -2002,8 +1916,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2018,40 +1932,117 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
diff --git a/contents+vi.po b/contents+vi.po
index 0dbd5d235..1c78d1361 100644
--- a/contents+vi.po
+++ b/contents+vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Henry Tran <henry.trancsr at gmail.com>, 2019\n"
 "Language-Team: Vietnamese (https://www.transifex.com/otf/teams/1519/vi/)\n"
@@ -192,13 +192,9 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"Mặc định, Trình duyệt Tor không giữ bất kì lịch sử duyệt web nào. Cookie chỉ"
-" hợp lệ cho các phiên đơn lẻ (cho đến khi Trình duyệt Tor đã thoát hoặc "
-"một<a href=\"/managing-identities/#new-identity\">danh tính mới</a>được yêu "
-"cầu)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -407,16 +403,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"Trong hầu hết các trường hợp, việc chọn \"Kết nối\" sẽ cho phép bạn kết nối "
-"tới mạng lưới Tor mà không cần bất cứ cấu hình nào thêm. Ngay khi được kích "
-"chuột, một thanh trạng thái sẽ xuất hiện, biểu thị tiến trình kết nối của "
-"Tor. Nếu tốc độ kết nối mạng của bạn tương đối nhanh, nhưng thanh này dường "
-"như bị nghẽn lại tại một điển nào đó, hãy xem trang  <a "
-"href=\"troubleshooting\">Xử lý sự cố</a> để giúp giải quyết vấn đề đó."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -448,15 +437,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"Màn ảnh đầu tiên hỏi nếu việc truy cập mạng lưới Tor bị khoá hay kiểm duyệt "
-"kết nối của bạn. Nếu bạn không tin vào trường hợp nay, chọn “Không”. Nếu bạn"
-" biết kết nối của bạn bị kiểm duyệt, hay bạn đã thử và thất bại khi kết nối "
-"đến mạng lưới Tor và không có giải pháp nào khác, chọn “Có”. Bạn sẽ được "
-"chuyển đến màn ảnh <a href=\"circumvention\">Vòng tránh</a> để cấu hình một "
-"trung chuyển có thể kết nối được."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -501,20 +484,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
-msgstr ""
-"Hầu hết <a href=\"transports\">Các điểm trung chuyển Có thể kết nối</a>, như"
-" obfs3 và obfs4, dựa trên việc dùng các khuyếch đại “cầu nối”. Giống như các"
-" khuyếch đại Tor thông thường, các cầu được vận hành bởi các bên tình "
-"nguyện; không giống như các khuyếch đại thông thường, tuy nhiên, chúng không"
-" được liệt kê công khai, vì vậy một bên thù địch không thể xác định chúng "
-"một cách dễ dàng. Sử dụng các cầu kết hợp với các điểm trung chuyển có thể "
-"kết nối giúp nguỵ trang thực tế rằng bạn đang sử dụng Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -667,8 +642,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -678,10 +653,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 làm cho tín hiệu Tor trên đường truyền như ngẫu nhiên tương tự obfs3, "
+"và cũng ngăn chặn các đối tượng kiểm duyệt tìm thấy các cầu nối bằng việc "
+"quét Internet. Các cầu obfs4 ít có khả năng bị chặn hơn các cầu obfs3."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -695,22 +673,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 làm cho tín hiệu Tor trên đường truyền như ngẫu nhiên tương tự obfs3, "
-"và cũng ngăn chặn các đối tượng kiểm duyệt tìm thấy các cầu nối bằng việc "
-"quét Internet. Các cầu obfs4 ít có khả năng bị chặn hơn các cầu obfs3."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -822,16 +784,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"Truy cập trực tiếp đến mạng lưới Tor có thể đôi lúc bị chặn bởi Nhà cung cấp"
-" Dịch vụ Internet hay nhà nước. Trình duyệt Tor có một vài công cụ vòng "
-"tránh để vượt qua những chướng ngại này. Những công cụ này được gọi là “các "
-"điểm trung chuyển có thể kết nối”. Xem trang <a href=\"/en-"
-"US/transports\">Những điểm trung chuyển Có thể kết nối</a> cho thêm thông "
-"tin về loại điểm trung chuyển hiện tại có thể dùng được."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -881,34 +836,24 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"Mỗi một điểm trung chuyển liệt kê trong danh mục Khởi động Tor, Tor "
-"Launcher, làm việc theo một cách khác nhau (để chi tiết hơn, xem trang <a "
-"href=\"/en-US/transports\">Các điểm trung chuyển Có thể kết nối</a>), và "
-"tính hiệu quả của chúng phụ thuộc vào các điều kiện riêng rẽ của bạn."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"Nếu bạn thử tất cả các lựa chọn này, và không cái nào giúp bạn kết nối, bạn "
-"sẽ cần nhập các địa chỉ cầu nối thủ công. Xem mục <a href=\"/en-"
-"US/bridges/\">Các cầu nối</a> để biết các cầu nối là gì và làm sao để lấy "
-"được chúng."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1006,9 +951,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1058,12 +1003,9 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* Xem trang <a href=\"/secure-connections\">Các kết nối Bảo mật</a> cho các "
-"thông tin quan trọng về việc làm thế nào để bảo mật kết nối của bạn trong "
-"khi đang đăng nhập."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1130,22 +1072,14 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"Lựa chọn này hữu dụng nếu <a href=\"/about/#how-tor-works\">khuyếch đại "
-"ra</a> bạn đang dùng không thể kết nối với trang web bạn yêu cầu, hoặc đang "
-"không tải nó một cách chính xác. Việc chọn nó sẽ làm cho cửa sổ hoặc thanh "
-"hiện đang kích hoạt bị tải lại qua một lộ trình Tor mới. Những cửa sổ và "
-"thanh đang mở khác từ cùng một trang web cũng sẽ dùng lộ trình mới đó ngay "
-"khi được tải lại. Lựa chọn này không xoá bất kỳ thông tin riêng tư nào hay "
-"ngắt kết nối các hoạt động của bạn, nó không tác động đến các kết nối hiện "
-"tại của bạn đến các trang web khác."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1195,12 +1129,9 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Toàn bộ tín hiệu truyền giữa những người dùng Tor và các dịch vụ onion "
-"được mã hoá end-to-end, vì vậy bạn không cần phải lo lắng về <a href"
-"=\"secure-connections\">việc kết nối qua HTTPS</a>."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1268,12 +1199,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"Bạn cũng có thể đảm bảo rằng bạn có thể truy cập các dịch vụ onion khác bởi "
-"kết nối đến <a href=\"http://3g2upl4pq6kufc4m.onion/\">Dịch vụ Tor của "
-"DuckDuckGo</a>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1368,19 +1295,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1391,19 +1310,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1414,10 +1325,6 @@ msgstr "Trang mạng được ghé thăm."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1467,10 +1374,6 @@ msgstr "Tor hiện có đang được sử dụng hay không."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1540,66 +1443,50 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "An toàn nhất"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"Tại cấp độ này, hình ảnh và âm thanh đa phương tiện HTML5 trở thành kích-để-"
-"chạy thông qua NoScript; tất cả các tối ưu hoá hiệu ứng JavaScript bị vô "
-"hiệu hoá; một vài phương trình toán học có thể không hiển thị một cách chính"
-" xác; một vài tính năng kiến tạo phông chữ bị vô hiệu hoá; một vài dạng hình"
-" ảnh bị vô hiệu hoá; JavaScript mặc định bị vô hiệu hoá trên tất cả các "
-"trang; hầu hết các định dạng âm thanh và hình ảnh bị vô hiệu hoá; và một vài"
-" phông chữ và biểu tượng có thể không hiển thị một cách chính xác."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "An toàn hơn"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"Tại cấp độ này, hình ảnh và âm thanh đa phương tiện HTML5 trở thành kích-để-"
-"chạy thông qua NoScript; tất cả các tối ưu hoá hiệu ứng JavaScript bị vô "
-"hiệu hoá; một vài phương trình toán học có thể không hiển thị một cách chính"
-" xác; một vài tính năng kiến tạo phông chữ bị vô hiệu hoá; một vài dạng hình"
-" ảnh bị vô hiệu hoá; và JavaScript mặc định bị vô hiệu hoá trên tất cả các "
-"trang không-<a href=\"secure-connections\">HTTPS</a>."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Chuẩn"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"Tại cấp độ này, tất cả các tính năng trình duyệt được kích hoạt. Đây là lựa "
-"chọn khả dụng nhất."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1690,32 +1577,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1726,7 +1610,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1831,11 +1715,8 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
-"Gỡ bỏ trình duyệt Tor khỏi hệ thống bằng việc xoá bỏ thư mục lưu trữ nó (Xem"
-" mục <a href=\"uninstalling\">Gỡ bỏ</a> để có thêm thông tin)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1926,19 +1807,12 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
-msgstr ""
-"Những người yêu cầu mức độ bảo mật cao trong việc lướt web nên đặt <a href"
-"=\"/security-slider\">Thanh trượt Bảo mật</a> của Trình duyệt Tor ở “Trunh "
-"bình-Cao” (điều này vô hiệu hoá JavaScript với các trang web không-HTTPS) "
-"hoặc “Cao” (vô hiệu hoá với tất cả mọi trang web). Tuy nhiên, việc vô hiệu "
-"hoá JavaScript sẽ làm cho nhiều trang web hiển thị không chính xác, vì cài "
-"đặt mặc định của Trình duyệt Tor để cho tất cả mọi trang web chạy các mã "
-"kịch bản (script)."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
+msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2060,12 +1934,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"Nếu bạn vẫn không thể kết nối, Nhà cung cấp Dịch vụ Internet của bạn có lẽ "
-"đang kiểm duyệt các kết nối đến mạng Tor. Xem mục <a "
-"href=\"circumvention\">Vòng tránh</a> cho những giải pháp có thể."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2076,14 +1947,9 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Trình duyệt Tor đang trong quá trình phát triển đều đặn, và một vài sự cố đã"
-" được biết đến nhưng vẫn chưa được khắc phục. Hãy kiểm tra trang <a href"
-"=\"/known-issues\">Các sự cố đã biết</a> để xem nếu vấn đề bạn đang trải "
-"nghiệm đã được liệt kê ở đó rồi."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2181,8 +2047,8 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -2197,45 +2063,118 @@ msgstr "Làm thế nào để gỡ bỏ Trình duyệt Tor khỏi hệ thống"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Việc xoá bỏ Trình duyệt Tor khỏi hệ thống là đơn giản:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Trình duyệt Tor không tác động đến bất cứ phần mền hay các cài đặt nào đang "
-"tồn tại trên máy tính của bạn. Việc huỷ cài đặt Trình duyệt Tor sẽ không tác"
-" động đến phần mềm hay các cài đặt hệ thống."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Việc xoá bỏ Trình duyệt Tor khỏi hệ thống là đơn giản:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Xoá thư mục chứa Trình duyệt Tor."
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Làm sạch Thùng rác"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Lưu ý là ứng dụng “Huỷ cài đặt” chuẩn của hệ điều hành không được sử dụng."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 9865574ef..ae3584c9b 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -4,16 +4,17 @@
 # erinm, 2019
 # 耀石 徐 <xuyaoshix at gmail.com>, 2019
 # Emma Peel, 2019
-# ff98sha, 2019
 # PCloud <heige.pcloud at outlook.com>, 2019
+# ヨイツの賢狼ホロ, 2019
+# ff98sha, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: PCloud <heige.pcloud at outlook.com>, 2019\n"
+"Last-Translator: ff98sha, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,11 +184,9 @@ msgstr "此外,Tor 浏览器的设计包括防止网站根据您的浏览器
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
-"* 默认情况下,Tor 浏览器不保存任何浏览记录。Cookie 仅在单次会话中有效(到 Tor 浏览器退出或者在请求 <a href"
-"=\"/managing-identities#new-identity\">新身份</a> 时失效)。"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -391,12 +390,9 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
-"在大多数情况下,点击“连接”可以让您不作任何进一步的设置就直接连上洋葱路由网络,点击后将会出现一条状态栏显示目前洋葱路由的连接创建过程,如果您的网络带宽充足但是此状态栏却长时间停滞在某个点上无法完成连接创建,请参考<a"
-" href=\"troubleshooting\">错误处理</a>页面以寻求解决问题的协助。"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -425,11 +421,9 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
-"在第一个界面中您需要选择,您所要访问的网络环境是否会过滤阻挡通往洋葱路由网络的连接。若您认为不会的话,请选择“否”。否则当您的网络被过滤或屏蔽,或您已经尝试过各种连上洋葱路由网络的方法但都失败的话,请选择“是”,本程序将会带领您前往<a"
-" href=\"circumvention\">审查规避</a>界面,进行可插拔传输层的相关设置。"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -467,16 +461,12 @@ msgstr "大多数可插拔传输,如 obfs3 和 obfs4,依赖于使用“网
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"大多数<a href=\"transports\">可插拔传输</a>,诸如 obfs3 和 obfs4,依赖于使用“网桥”中继。与普通的 Tor "
-"中继类似,网桥由志愿者运行。然而与普通的中继不同,它们并不是公开列出,因此对手不能轻易识别它们。将网桥与可插拔传输结合使用有助于掩饰您使用 Tor "
-"的事实。"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -620,8 +610,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -631,11 +621,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3使洋葱路由的流量看起来像是随机,从而使网络过滤阻档机制难以判定此网络连接是洋葱路由或是其他网络协议。虽然仍然包含在默认选项之下,但我们建议用户使用obfs4,因为它比obfs3有多处安全性改进。"
+"obfs4 可以像 obfs3 "
+"一样让洋葱路由所发送的网络信号看起来像是随机乱数一般,并且还可以避免网络过滤监控机制利用网段扫描法找出网桥的地址,因此相较之下 obfs4 "
+"网桥更难以被网络监控过滤机制阻挡。"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -649,22 +641,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 可以像 obfs3 "
-"一样让洋葱路由所发送的网络信号看起来像是随机乱数一般,并且还可以避免网络过滤监控机制利用网段扫描法找出网桥的地址,因此相较之下 obfs4 "
-"网桥更难以被网络监控过滤机制阻挡。"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -781,13 +757,9 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
-"有时候您的网络服务供应商或政府单位会阻挡洋葱路由网络的直接访问,因此 Tor "
-"浏览器有内置一些能够绕过这类过滤机制的规避工具,它们通常叫作“可插拔传输”,您可以参考此网页<a href=\"/en-"
-"US/transports\">可插拔传输</a>以获取更多关于各种目前可以使用的规避工具。"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -837,30 +809,24 @@ msgstr "##### 我该使用哪种传输方式?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
-"在洋葱路由启动器中所罗列的可插拔传输,其运作原理各不相同(请参考 <a href=\"/en-"
-"US/transports\">可插拔传输</a>以了解更多相关信息),且产生的效果也会视您的的实际情况而定。"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
-msgstr "如果您第一次运行时希望规避审查,您应该尝试不同的可插拔传输层:obfs3, obfs4, fte 和 meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
+msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
-"如果您试过了上述的全部选项后还是不能上网,那就得手动输入网桥地址了。请参考<a href=\"/en-"
-"US/bridges/\">网桥</a>部分以进一步了解网桥的运作原理与获取方式。"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -943,13 +909,10 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
-"在回路中,防护节点/入口节点是洋葱路由自动且随机选择的首个节点。它与回路中其他节点不同。为了防止配置文件被攻击,防护节点仅会2-3个月更换一次,而其他节点随着新域名而更换。关于防护节点的更多信息,请参阅"
-" <a href=\"https://www.torproject.org/docs/faq#EntryGuards\">常见问题 </a>和<a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">帮助中心</a>。"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -987,10 +950,9 @@ msgstr "当您通过 Tor 登录一个网站时,有几点应该牢记:"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* 参见 <a href=\"/zh-CN/secure-connections\">安全连接</a> 页面了解如何在登录时确保连接安全的重要信息。"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1049,16 +1011,14 @@ msgstr "###### 用于此网站的新 Tor 链路"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
-"当您目前的洋葱路由回路中所使用的<a href=\"about-tor-browser#how-tor-"
-"works\">出口节点</a>无法正常连上您所欲访问的网站或加载其网页时,可以试着运行此功能,它会让当前窗口或页签创建另一条新的洋葱路由回路并重新连上该址定网站,若有其他窗口或页签也是连上该网站的话,在刷新时也会改用新的洋葱路由回路来连接,此功能不会清除任何个人相关信息或中断连上其他网站的活动。"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1102,11 +1062,9 @@ msgstr "* 洋葱服务的真实网络地址与地理位置信息被隐藏,因
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
-"* Tor 浏览器用户与洋葱服务之间所有流量都为端到端加密,因此您无需担心连接是否是为<a href=\"/zh-CN/secure-"
-"connections\">通过 HTTPS</a> 进行。"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1172,11 +1130,8 @@ msgstr "如果您仍然无法连上该洋葱服务的话,请稍候再试,有
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
-"您也可以借由连接 <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo "
-"的洋葱服务</a>确认您是否可以正常访问洋葱服务"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1257,19 +1212,11 @@ msgstr "##### 潜在可视数据"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1280,19 +1227,11 @@ msgstr "site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1303,10 +1242,6 @@ msgstr "被访问的网站。"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1354,10 +1289,6 @@ msgstr "是否使用了 Tor。"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1422,57 +1353,50 @@ msgstr "增加安全级别将禁用或部分禁用某些浏览器功能以防止
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "最高安全性"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"在此安全性等级下,以 HTML 5 建构的视频和音频可通过 NoScript 扩展程序来随点即播;所有的 JavaScript "
-"性能优化皆被关闭;某些数学函数可能无法正常显示;某些字体渲染功能被关闭;部分格式的图形显示被关闭;所有网站上的 JavaScript "
-"功能被关闭;大部分视频与音频格式的支持被关闭;以及某些字体以及图标可能无法正常显示。"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "中等安全性"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"在此安全性等级下,以 HTML 5 建构的视频和音频可通过 NoScript 扩展程序来随点即播;所有 JavaScript "
-"性能优化皆会被关闭;某些数学函数可能无法正常显示;某些字体渲染功能被关闭;部分格式的图形显示功能被关闭;针对不支持 <a href=\"/zh-CN"
-"/secure-connections\">HTTPS</a> 加密连接的网站会关闭 JavaScript 功能。"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "标准安全性"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
-msgstr "在此安全性等级下,所有浏览器的功能都将被启用,这是可用性最高的安全性模式。"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1567,35 +1491,30 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "在这个级别,所有的Tor 浏览器与网站功能都是启用的。"
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "这个级别将禁用通常危险的网站功能。"
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "这可能导致一些网站不能正常运作。"
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript在所有的非<a href=\"/secure-"
-"connections\">HTTPS</a>网站上被禁用;一些字体和数学符号被禁用;音频与视频(HTML5媒体)是点击即可播放的。"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
-msgstr "这个级别只允许需要静态功能的网站与基本的服务。"
+"* This level only allows website features required for static sites and "
+"basic services."
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1605,10 +1524,10 @@ msgstr "这些改变影响图像,媒体与脚本。"
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
-msgstr "JavaScript默认在所有网站上被禁用;一些字体,图标,数学符号和图像被禁用;音频和视频(HTML5媒体)是点击即可播放的。"
+msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1696,9 +1615,8 @@ msgstr "在您被提示应更新 Tor 浏览器时,结束浏览并关闭程序
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
-msgstr "删除其所在文件夹以删除您的系统上的 Tor 浏览器(操作细节见 <a href='uninstalling'>卸载</a> 章节)。"
+"(see the [Uninstalling](/uninstalling) section for more information)."
+msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1782,15 +1700,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
-"在浏览中需要更高安全性的用户应该调整 Tor 浏览器的 <a href=\"/security-slider\">安全滑块</a> "
-"到“中等安全性”(在非 HTTPS 网站上禁用 JavaScript)或“最高安全性”(在所有网站禁用 JavaScript)等级。不过因为禁用 "
-"JavaScript 可能会使网站无法正常显示, Tor 浏览器是默认设置是允许所有网站运行脚本的“标准安全性”等级。"
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -1890,11 +1805,9 @@ msgstr "##### 您的连接是否受审查?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
-"* 如果您仍然无法连接上网,很有可能是因为您的网络服务商有使用会阻挡洋葱路由网络连接的网络监控系统,请参考<a "
-"href=\"circumvention\">规避</a>网页以了解可行的解决方法。"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1905,12 +1818,9 @@ msgstr "##### 已知问题"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
-"Tor 浏览器的开发仍在不断进行中,有些已知的软件错误可能仍未被修复,您可以查阅<a href=\"known-"
-"issues\">已知问题</a>页面了解您遭遇的问题是否已被收录其中。"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -1995,11 +1905,9 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* <mark><a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-"
-"idea\">即使通过 Tor 网络,BitTorrent 也不是匿名的</a></mark>。"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2013,43 +1921,118 @@ msgstr "如何在您的系统上删除 Tor 浏览器"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "在您的系统上删除 Tor 浏览器非常简单:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
-msgstr "Tor 浏览器不影响您的计算机上的任何现有的软件或设置。卸载 Tor 浏览器不会影响您的系统的软件或设置。"
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "在您的系统上删除 Tor 浏览器非常简单:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* 删除 Tor 浏览器文件夹或者应用程序。"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* 清空回收站。"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
-"1. 去到你的 Tor 浏览器所在的文件夹。Windows 下默认的位置是桌面;在 MacOS 默认位置是 Application 文件夹。在 "
-"Linux,没有默认目录,但如果你运行的是英文版 Tor 浏览器的话,文件夹名称都会命名为“tor-browser_en-US”。"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. 删除 Tor 浏览器文件夹。"
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. 清空您的垃圾箱/回收站"
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "注意:无需使用您的系统提供的标准的“卸载”工具。"
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index ec59b8978..32cce332a 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+0000\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -179,8 +179,8 @@ msgstr "並且,洋蔥路由瀏覽器有經過特殊設計,可以防止網站
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/about/
@@ -377,9 +377,8 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -409,8 +408,8 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -449,12 +448,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
 #: https//tb-manual.torproject.org/bridges/
@@ -598,8 +596,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -609,10 +607,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 可以像 obfs3 "
+"一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般,並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址,因此相較之下 obfs4 "
+"橋接器更難以被網路監控過濾機制阻擋。"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -626,22 +627,6 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 可以像 obfs3 "
-"一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般,並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址,因此相較之下 obfs4 "
-"橋接器更難以被網路監控過濾機制阻擋。"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -751,9 +736,8 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
@@ -804,25 +788,23 @@ msgstr ""
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -902,9 +884,9 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -943,8 +925,8 @@ msgstr "當您透過洋蔥路由來登入某個網站時,以下幾個重點您
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1002,13 +984,13 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/managing-identities/
@@ -1053,8 +1035,8 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/onion-services/
@@ -1114,8 +1096,7 @@ msgstr "如果您仍然無法連上該洋蔥服務的話,請稍候再試,有
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
@@ -1194,19 +1175,11 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr ""
 
@@ -1217,19 +1190,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr ""
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr ""
 
@@ -1240,10 +1205,6 @@ msgstr "被造訪的網站。"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr ""
 
@@ -1291,10 +1252,6 @@ msgstr "不論是否有使用洋蔥路由"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr ""
 
@@ -1358,54 +1315,50 @@ msgstr "藉由安全性等級調整棒來提高安全性等級,會讓部分瀏
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "最安全"
+msgid "###### Safest"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"在此安全性等級下,以 HTML 5 所建構的影音多媒體可透過 NoScript 擴充元件來隨點即播;所有的 JavaScript "
-"效能最佳化功能皆會被關閉;某些數學函式可能無法正常顯示;某些字型渲染功能會被關閉;部分格式的圖形顯示功能會被關閉;所有網站上的 JavaScript "
-"功能都會被關閉;大部分的影片與音效格式的支援都會被關閉;並且某些字型以及圖示可能無法正常顯示。"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "較安全"
+msgid "###### Safer"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "標準"
+msgid "###### Standard"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
-msgstr "在此安全性等級下,所有瀏覽器的功能都將被啟用,這是可用性最高的安全性模式。"
+msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
@@ -1496,32 +1449,29 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr ""
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1532,7 +1482,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
@@ -1623,8 +1573,7 @@ msgstr "當洋蔥路由瀏覽器通知您必須要更新時,請結束網頁瀏
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
@@ -1707,11 +1656,11 @@ msgstr ""
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 
 #: https//tb-manual.torproject.org/plugins/
@@ -1811,8 +1760,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 
 #: https//tb-manual.torproject.org/troubleshooting/
@@ -1824,9 +1773,8 @@ msgstr ""
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 
 #: https//tb-manual.torproject.org/known-issues/
@@ -1910,8 +1858,8 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
@@ -1926,41 +1874,118 @@ msgstr "如何從您的系統中移除洋蔥路由瀏覽器"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
-msgstr "洋蔥路由瀏覽器不會更動或影響您電腦系統中的設定或其他軟體的運作,移除洋蔥路由瀏覽器亦同。"
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
+msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
+msgid "* Go to your `~/Library/Application Support/` folder."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
-msgstr "請注意,您作業系統中的標準「反安裝」工具並未被使用。"
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Delete the Tor Browser folder."
+msgstr ""
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
+msgstr ""
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9
diff --git a/contents.pot b/contents.pot
index 6eb7bd87e..f7f3d8123 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-27 14:16+CET\n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: en <LL at li.org>\n"
@@ -184,12 +184,12 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 msgstr ""
 "By default, Tor Browser does not keep any browsing history. Cookies are only"
-" valid for a single session (until Tor Browser is exited or a <a href"
-"=\"/managing-identities/#new-identity\">New Identity</a> is requested)."
+" valid for a single session (until Tor Browser is exited or a [New Identity"
+"](/managing-identities/#new-identity) is requested)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -415,16 +415,14 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration. Once clicked, a status bar will "
 "appear, showing Tor’s connection progress. If you are on a relatively fast "
-"connection, but this bar seems to get stuck at a certain point, see the <a "
-"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
-"problem."
+"connection, but this bar seems to get stuck at a certain point, see the "
+"[Troubleshooting](/troubleshooting) page for help solving the problem."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -456,15 +454,15 @@ msgid ""
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 msgstr ""
 "The first screen asks if access to the Tor network is blocked or censored on"
 " your connection. If you do not believe this is the case, select “No”. If "
 "you know your connection is censored, or you have tried and failed to "
 "connect to the Tor network and no other solutions have worked, select “Yes”."
-" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
-"screen to configure a pluggable transport."
+" You will then be taken to the [Circumvention](/circumvention) screen to "
+"configure a pluggable transport."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -508,19 +506,17 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
-"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
-" are run by volunteers; unlike ordinary relays, however, they are not listed"
-" publicly, so an adversary cannot identify them easily. Using bridges in "
-"combination with pluggable transports helps to disguise the fact that you "
-"are using Tor."
+"Most [Pluggable Transports](/transports), such as obfs3 and obfs4, rely on "
+"the use of “bridge” relays. Like ordinary Tor relays, bridges are run by "
+"volunteers; unlike ordinary relays, however, they are not listed publicly, "
+"so an adversary cannot identify them easily. Using bridges in combination "
+"with pluggable transports helps to disguise the fact that you are using Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -689,8 +685,8 @@ msgstr "<td>"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs3"
-msgstr "obfs3"
+msgid "obfs4"
+msgstr "obfs4"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -700,13 +696,13 @@ msgstr "</td>"
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 msgstr ""
-"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
-"any other protocol. While still included by default, it is reccomended to "
-"use obfs4 instead, as it has several security improvements over obfs3."
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -720,22 +716,6 @@ msgstr "<tr class=\"even\">"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
-msgid "obfs4"
-msgstr "obfs4"
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
-msgid ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-msgstr ""
-"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
-"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
-"be blocked than obfs3 bridges."
-
-#: https//tb-manual.torproject.org/transports/
-#: (content/transports/contents+en.lrtopic.body)
 msgid "FTE"
 msgstr "FTE"
 
@@ -863,16 +843,14 @@ msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 msgstr ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government. Tor Browser includes some circumvention"
 " tools for getting around these blocks. These tools are called “pluggable "
-"transports”. See the <a href=\"/en-US/transports\">Pluggable Transports</a> "
-"page for more information on the types of transport that are currently "
-"available."
+"transports”. See the [Pluggable Transports](/en-US/transports) page for more"
+" information on the types of transport that are currently available."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -931,36 +909,32 @@ msgstr "##### WHICH TRANSPORT SHOULD I USE?"
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 msgstr ""
 "Each of the transports listed in Tor Launcher’s menu works in a different "
-"way (for more details, see the <a href=\"/en-US/transports\">Pluggable "
-"Transports</a> page), and their effectiveness depends on your individual "
-"circumstances."
+"way (for more details, see the [Pluggable Transports](/en-US/transports) "
+"page), and their effectiveness depends on your individual circumstances."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 msgstr ""
 "If you are trying to circumvent a blocked connection for the first time, you"
-" should try the different transports: obfs3, obfs4, fte, and meek-azure."
+" should try the different transports: obfs4, fte, and meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 msgstr ""
 "If you try all of these options, and none of them gets you online, you will "
-"need to enter bridge addresses manually. Read the <a href=\"/en-"
-"US/bridges/\">Bridges</a> section to learn what bridges are and how to "
-"obtain them."
+"need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
+" section to learn what bridges are and how to obtain them."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1057,17 +1031,17 @@ msgid ""
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
 "In the circuit, the Guard or entry node is the first node and it's "
 "automatically and randomly selected by Tor. But it is different from the "
 "other nodes in the circuit. In order to avoid profiling attacks, the Guard "
 "node changes only after 2-3 months, unlike the other nodes, which change "
-"with every new domain. For more information about Guards, consult the <a "
-"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
-"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+"with every new domain. For more information about Guards, consult the "
+"[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
+"Portal](https://support.torproject.org/tbb/tbb-2/)."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1114,11 +1088,11 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 msgstr ""
-"* See the  <a href=\"/secure-connections\">Secure Connections</a> page for "
-"important information on how to secure your connection when logging in."
+"* See the [Secure Connections](/secure-connections) page for important "
+"information on how to secure your connection when logging in."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1186,21 +1160,21 @@ msgstr "###### NEW TOR CIRCUIT FOR THIS SITE"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
-msgstr ""
-"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
-"relay</a> you are using is unable to connect to the website you require, or "
-"is not loading it properly. Selecting it will cause the currently-active tab"
-" or window to be reloaded over a new Tor circuit. Other open tabs and "
-"windows from the same website will use the new circuit as well once they are"
-" reloaded. This option does not clear any private information or unlink your"
-" activity, nor does it affect your current connections to other websites."
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
+msgstr ""
+"This option is useful if the [exit relay](/about/#how-tor-works) you are "
+"using is unable to connect to the website you require, or is not loading it "
+"properly. Selecting it will cause the currently-active tab or window to be "
+"reloaded over a new Tor circuit. Other open tabs and windows from the same "
+"website will use the new circuit as well once they are reloaded. This option"
+" does not clear any private information or unlink your activity, nor does it"
+" affect your current connections to other websites."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1252,12 +1226,12 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 msgstr ""
 "* All traffic between Tor users and onion services is end-to-end encrypted, "
-"so you do not need to worry about <a href=\"/secure-connections\">connecting"
-" over HTTPS</a>."
+"so you do not need to worry about [connecting over HTTPS](/secure-"
+"connections)."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1334,12 +1308,10 @@ msgstr ""
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 msgstr ""
 "You can also ensure that you're able to access other onion services by "
-"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
-"Service</a>"
+"connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1430,19 +1402,11 @@ msgstr "##### POTENTIALLY VISIBLE DATA"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dl>"
 msgstr "<dl>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dt>"
 msgstr "<dt>"
 
@@ -1453,19 +1417,11 @@ msgstr "Site.com"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dt>"
 msgstr "</dt>"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "<dd>"
 msgstr "<dd>"
 
@@ -1476,10 +1432,6 @@ msgstr "The site being visited."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dd>"
 msgstr "</dd>"
 
@@ -1529,10 +1481,6 @@ msgstr "Whether or not Tor is being used."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-slider/
-#: (content/security-slider/contents+en.lrtopic.body)
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
 msgid "</dl>"
 msgstr "</dl>"
 
@@ -1603,20 +1551,20 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safest"
-msgstr "Safest"
+msgid "###### Safest"
+msgstr "###### Safest"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; Javascript is "
@@ -1627,40 +1575,38 @@ msgstr ""
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Safer"
-msgstr "Safer"
+msgid "###### Safer"
+msgstr "###### Safer"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
-"At this level, HTML5 video and audio media become click-to-play via "
+"* At this level, HTML5 video and audio media become click-to-play via "
 "NoScript; all JavaScript performance optimizations are disabled; some "
 "mathematical equations may not display properly; some font rendering "
 "features are disabled; some types of image are disabled; and JavaScript is "
-"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites."
+"disabled by default on all non-[HTTPS](/secure-connections) sites."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "Standard"
-msgstr "Standard"
+msgid "###### Standard"
+msgstr "###### Standard"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
 msgid ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
-"At this level, all browser features are enabled. This is the most usable "
+"* At this level, all browser features are enabled. This is the most usable "
 "option."
 
 #: https//tb-manual.torproject.org/security-settings/
@@ -1774,38 +1720,37 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "At this level, all Tor Browser and website features are enabled."
-msgstr "At this level, all Tor Browser and website features are enabled."
+msgid "* At this level, all Tor Browser and website features are enabled."
+msgstr "* At this level, all Tor Browser and website features are enabled."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
-msgid "This level disables website features that are often dangerous."
-msgstr "This level disables website features that are often dangerous."
-
-#: https//tb-manual.torproject.org/security-settings/
-#: (content/security-settings/contents+en.lrtopic.body)
-msgid "This may cause some sites to lose functionality."
-msgstr "This may cause some sites to lose functionality."
+msgid ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
+msgstr ""
+"* This level disables website features that are often dangerous. This may "
+"cause some sites to lose functionality."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 msgstr ""
-"JavaScript is disabled on all non-<a href=\"/secure-connections\">HTTPS</a> "
-"sites; some fonts and math symbols are disabled; audio and video (HTML5 "
-"media) are click-to-play."
+"* JavaScript is disabled on all non-[HTTPS](/security-settings) sites; some "
+"fonts and math symbols are disabled; audio and video (HTML5 media) are "
+"click-to-play."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 msgstr ""
-"This level only allows website features required for static sites and basic "
-"services."
+"* This level only allows website features required for static sites and "
+"basic services."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1815,11 +1760,11 @@ msgstr "These changes affect images, media, and scripts."
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
-"Javascript is disabled by default on all sites; some fonts,icons, math "
+"* Javascript is disabled by default on all sites; some fonts, icons, math "
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 
@@ -1922,12 +1867,10 @@ msgstr ""
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
-"(see the <a href='uninstalling'>Uninstalling</a> section for more "
-"information)."
+"(see the [Uninstalling](/uninstalling) section for more information)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2021,18 +1964,18 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/noscript_menu.png\">"
 #: (content/plugins/contents+en.lrtopic.body)
 msgid ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 msgstr ""
 "Users who require a high degree of security in their web browsing should set"
-" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
-"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
-"so for all websites). However, disabling JavaScript will prevent many "
-"websites from displaying correctly, so Tor Browser’s default setting is to "
-"allow all websites to run scripts in \"Standard\" mode."
+" Tor Browser’s [Security Slider](/security-slider) to “Safer” (which "
+"disables JavaScript for non-HTTPS websites) or “Safest” (which does so for "
+"all websites). However, disabling JavaScript will prevent many websites from"
+" displaying correctly, so Tor Browser’s default setting is to allow all "
+"websites to run scripts in \"Standard\" mode."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -2152,12 +2095,12 @@ msgstr "##### IS YOUR CONNECTION CENSORED?"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
 "If you still can’t connect, your Internet Service Provider might be "
-"censoring connections to the Tor network. Read the <a "
-"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+"censoring connections to the Tor network. Read the "
+"[Circumvention](/circumvention) section for possible solutions."
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -2168,14 +2111,12 @@ msgstr "##### KNOWN ISSUES"
 #: (content/troubleshooting/contents+en.lrtopic.body)
 msgid ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 msgstr ""
 "Tor Browser is under constant development, and some issues are known about "
-"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
-"Issues</a> page to see if the problem you are experiencing is already listed"
-" there."
+"but not yet fixed. Please check the [Known Issues](/known-issues) page to "
+"see if the problem you are experiencing is already listed there."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2271,11 +2212,11 @@ msgstr "./start-tor-browser.desktop"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
-"* BitTorrent in specific is <mark><a href=\"https://blog.torproject.org"
-"/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a></mark>."
+"* BitTorrent in specific is [not anonymous over "
+"Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2289,49 +2230,138 @@ msgstr "How to remove Tor Browser from your system"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Removing Tor Browser from your system is simple:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Windows:"
+msgstr "On Windows:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 msgstr ""
-"Tor Browser does not affect any of the existing software or settings on your"
-" computer. Uninstalling Tor Browser will not affect your system’s software "
-"or settings."
+"* Locate your Tor Browser folder or application. The default location is the"
+" Desktop."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "Removing Tor Browser from your system is simple:"
-msgstr "Removing Tor Browser from your system is simple:"
+msgid "* Delete the Tor Browser folder or application."
+msgstr "* Delete the Tor Browser folder or application."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Empty your Trash."
+msgstr "* Empty your Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On macOS:"
+msgstr "On macOS:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+msgstr ""
+"* Locate your Tor Browser application. The default location is the "
+"Applications folder."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Move the Tor Browser application to Trash."
+msgstr "* Move the Tor Browser application to Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "* Go to your `~/Library/Application Support/` folder."
+msgstr "* Go to your `~/Library/Application Support/` folder."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+msgstr ""
+"* Note the Library folder is hidden on newer versions of macOS. To navigate "
+"to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+msgstr ""
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go "
+"to folder menu option.\">"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+msgstr ""
+"*  Then type \"~/Library/Application Support/\" in the window and click Go."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
 msgstr ""
-"1. Locate your Tor Browser folder. The default location on Windows is the "
-"Desktop; on macOS it is the Applications folder. On Linux, there is no "
-"default location, however the folder will be named \"tor-browser_en-US\" if "
-"you are running the English Tor Browser."
+"<img class=\"\" src=\"/static/images/macos-go-to-folder-window.png\" "
+"alt=\"Go to folder window.\">"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "2. Delete the Tor Browser folder."
-msgstr "2. Delete the Tor Browser folder."
+msgid "* Locate the TorBrowser-Data folder and move it to Trash."
+msgstr "* Locate the TorBrowser-Data folder and move it to Trash."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+msgstr ""
+"Note that if you did not install Tor Browser in the default location (the "
+"Applications folder), then the TorBrowser-Data folder is not located in the "
+"`~/Library/Application Support/` folder, but in the same folder where you "
+"installed Tor Browser."
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "On Linux:"
+msgstr "On Linux:"
+
+#: https//tb-manual.torproject.org/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
+msgstr ""
+"* Locate your Tor Browser folder. On Linux, there is no default location, "
+"however the folder will be named \"tor-browser_en-US\" if you are running "
+"the English Tor Browser."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
-msgid "3. Empty your Trash"
-msgstr "3. Empty your Trash"
+msgid "* Delete the Tor Browser folder."
+msgstr "* Delete the Tor Browser folder."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 msgstr ""
-"Note that your operating system’s standard “Uninstall” utility is not used."
+"Note that your operating system’s standard \"Uninstall\" utility is not "
+"used."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9



More information about the tor-commits mailing list